cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-19 10:06:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
2457 Commits
Author SHA1 Message Date
GDNandGitHub 9e6dcf9c46 removes the remaining datum redeclares (#25220) 
* removes the remaining datum redeclares

* the two fixes

* finneee contra

* OK CONTRA

* readd

* CURSED TO BE BROWN!

* facking automerge
 2024-04-21 18:26:35 +00:00
DGamerLGitHubDenizFunnyMan3595
 		bad8b31afa Changes all .len to length() where applicable (#25174) 
* Globals work

* Double access works

* All other things

* Revert "All other things"

This reverts commit 6574442eb6.

* More changes that compile and work

* IT WORKS AAAAAA

* Changes even more .len to length()

* Apply suggestions from code review

* Update code/datums/mind.dm

* Update code/__HELPERS/sorts/InsertSort.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

* Update code/__HELPERS/sanitize_values.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
 2024-04-19 17:32:09 +00:00
LucandGitHub 8500df223d cleans up some span mishaps (#25106) 2024-04-19 14:19:51 +00:00
Charlie NolanGitHubBurzah
 		fe74786905 Made storage nesting better, improved consistency between storage types. (#24699) 
* Made storage nesting better, improved consistency between storage types.

* Out, er, space.

* Null safety is good.

* Apply suggestions from code review

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-04-10 18:59:43 +00:00
ContrabangandGitHub 744d9c6bed Ports and Adapts TGUI strip panel from TG (#24618) 
* part 1

* these also

* fuckin nuke it

* more

* more stuff

* more crap

* wow

* holy fucking shit, it works

* thats a start

* oops

* fubing bundle

* hahah brrrrr

* I LITERALLY ADDED IT BACK, FUCK OFF GIT

* yeah more changes

* hide abstract

* blamo

* thats enough for today

* old code begone

* goodbye can_strip

* nearly there

* finally

* fuckin finally

* review

* tgui

* unbreak shit

* fix OD

* okay, that should fix the last thing

* remove hover on nodrop, fix early interacting
 2024-04-08 21:40:11 +00:00
DGamerLandGitHub 2359f6cb99 Refactors this entire proc because fuck this thing (#25013) 2024-04-07 10:16:22 +00:00
DGamerLandGitHub 0bfe115003 One flag removal (#24811) 2024-04-07 09:47:22 +00:00
ContrabangGitHubCRUNCHHenri215Charlie Nolan
 		34ba019704 Adds more descriptions to missing items and changes some (#24584) 
* jesus fuck thats a lot of descs

* Apply suggestions from code review

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

* review

* christa review

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>

---------

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
 2024-04-07 09:44:27 +00:00
1080pCatandGitHub 399651a116 Update accessory.dm (#24900) 2024-04-03 14:23:26 +00:00
Charlie NolanandGitHub 321c887e8a Disguised clown shoes. (#24639) 
* Disuised clown shoes.

* Prevent clown shoe subtypes from being dyed.

* Apply review suggestions.
 2024-03-29 14:50:39 +00:00
CRUNCHGitHubDGamerL
 		d49d9d5189 Soap is no longer comdom scented. Collectable captain hat doesn't look like a comdom hat. (#24661) 
* no comdoms

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

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-27 05:54:48 +00:00
Charlie NolanandGitHub 30b5c71ac0 Null-safe pockets. (#24812) 2024-03-26 09:46:07 +00:00
LucandGitHub 1fe7819c1b Ports action button refactor from /tg/ (#24482) 
* add the new stuff

* guh

* add the brunt of it

* action button stuff

* adds a lot of other stuff

* careful find and replace

* it loads

* so many huds

* ehh yeah this kinda works

* fixes this runtime

* hacks in some DMI stuff, we'll fix it later

* Adds better mouse pointer for dragging buttons

* gets dragging into place working again, updates DMI

* moves define

* remove extra hud defines, now it compiles

* CHECK GREP

* owww

* rename action defines

* ticks

* are we good

* let's try that again

* renames mob vars

* renames

* fixes some hud issues with huds getting the wrong variable

* fixes some alignment issues

* Adds mouse-wheel scroll support

* left -> right

* I am the entire circus

* first self-review pass

* Another review pass -- just realized I need to fix keybinds

* more testing

* update icons

* oops

* Fix spell icons not appearing properly

* fixes some outstanding issues
- Action button backgrounds now work properly
- Fixes some runtimes on dropping
- Fixes some misplaced icons

* hmm

* weh

* again?

* nah?

* maybe this?

* asdf

* should finally fix CI

* add client check

* move the ?

* add missing override causing runtimes

* shift-clicking now doesn't trigger the button

* better docs
 2024-03-24 17:38:53 +00:00
ContrabangandGitHub 323d23acc9 Datumizes Wizards (#24702) 
* fucking wizards

* this too

* this

* i think thats it

* okay lets do this

* remove commented code

* gdn review

* welp

* fix runtime

* yes

* lewc review
 2024-03-21 20:56:55 +00:00
Henri215GitHubContrabang
 		765461f14a Bear update, part 2 (#24506) 
* The bear update!

* more sprites

* more bearprites

* diversify

* removing comments

* description and mapping

* duplicate

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-03-20 21:33:32 +00:00
matttheficusGitHubContrabang
 		fac94d826c Adds Boot Knives (Combat + Mining Boots + Jump Boots) (#24530) 
* stabbing time

* examine text

* oopsie

* spans

* add to jumpboots

* contra review

* henri/gdn reviews

* contra + burzah review

* span swap

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-03-20 20:55:21 +00:00
McRamonGitHubHenri2151080pCat
 		d18cebac6e Cowboy hats resprite (#24611) 
* human_mob

* items

* grey_mob

* drask_mob

* vox_mob

* code, lets fucking hope i didnt forget anything

* i forgot stupid fuckign shit

* also i love to delete wrong things

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

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

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

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

* moved to other cowboy hats

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-03-20 20:23:54 +00:00
McRamonGitHubHenri215
 		d02d54bfd4 Security poncho (#24614) 
* all at once

* no

* ah yes

* minor pixel adjustments

* moved

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-20 19:55:59 +00:00
MarmGitHub1080pCatHenri215DGamerL
 		fdef20cc9e Adds Meson Sunglasses (#24619) 
* meson sunglasses

* species sprites ew

* why

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

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

* eeh

* Apply suggestions from code review

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

* Apply suggestions from code review

Self commit time (With approval)

---------

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-18 17:54:24 +00:00
JimKil3andGitHub aa740508e2 Fixes assistants spawning with fake wizard gear (#24631) 
* yea

* spacing
 2024-03-15 20:18:04 +00:00
Henri215GitHubBurzahLuc
 		1c41bbd4be Resprites brown and white fedora (#24334) 
* Resprites brown and white fedora

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

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

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

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-03-12 11:42:13 +00:00
ChristasmurfGitHubHenri215
 		03f66b19cc Quartermaster Drip (#24341) 
* quartermasterdrip

* Update code/modules/clothing/head/job_hats.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: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-11 15:05:27 -04:00
ContrabangGitHubHenri215Luc
 		3557748229 People are now hidden behind smoke (#24229) 
* no, that is NOT solid snake

* lol

* more names

* Update code/game/objects/items/weapons/storage/boxes.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/game/objects/items/weapons/storage/belt.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-03-11 14:13:59 -04:00
ContrabangandGitHub e32544e599 #undef is now required for all file defines (#24091) 
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
 2024-03-11 14:03:30 -04:00
Charlie NolanGitHubS34NGDN
 		d5461d38c8 Improved storage UX of labcoats and similar. (#24404) 
* Improved storage UX of labcoats and similar.

* Don't runtime when forceMove is called during initializtion.

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

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

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

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

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

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-03-10 20:20:09 +00:00
McRamonGitHubHenri215
 		046c841cab New plasmaman suit - Coke Suit (#24465) 
* all done????

* no

* ave emperor

* aaaand last pixel adjsutment

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

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

* box name

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

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

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-10 18:19:55 +00:00
ContrabangGitHubDGamerL
 		9345f1a5e3 Buffs all glasses (#24372) 
* fucking hate this shit

* Update code/modules/clothing/clothing.dm

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-10 18:03:33 +00:00
OctusandGitHub da979a5fd8 Makes Lavaland Actually... Hot 🔥 and some other tweaks for said heat. (#23325) 
* d

* Revert "d"

This reverts commit 8a4bf06f5c.

* hot hot HOT

* Makes Unathi natrually heat resistant

* unathi can breath superheat, also bone bracers

* hecksuit heat resist

* hot

* hermit tweak

* fresh jays

* SPICYYYYYYY HOT HOT ARIBA ARIBA

* oooo wee pressure fix

* lavaland stuff by SabreML

* Update lava.dm

* fixes temps

* Update asteroid_floors.dm

* Update minerals.dm

* Sabres edits

* holy shit atmos is so painful

* ITS NOT DEAD YET SPRITES INCOMING

* A PULSE

* Update lavaland_surface_althland_excavation.dmm

* Update lavaland_surface_hermit.dmm

* mapping shit

* sprites

* no hood

* Update lung_datum.dm

* heatproofs lavaland xenos, and fixes ancient robot

* mine bots are heat resistant

* Update explorer_gear.dm

* adds heat resist to lavaland items
 2024-03-10 17:34:46 +00:00
Charlie NolanandGitHub 20096f3592 [s] Make on_mob_movement work on all mob movement (#24491) 
* Updated on_mob_move to be called on all mob movement.

* Call parent in mob/living/Moved
 2024-03-07 17:55:06 +00:00
CRUNCHandGitHub 3798688096 DISHONOURABLE DEMOTION! (#24283) 2024-03-07 09:34:24 +00:00
Charlie NolanandGitHub 7ae3bf6747 Stop using \improper improperly. (#24410) 2024-03-03 18:04:52 +00:00
warriorstar-orionGitHubLucS34N
 		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
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
 		45ab7264c5 Galoshes no longer runtime when dispensed from a vendor. (#24170) 
* Galoshes no longer runtime when dispensed from a vendor.

* Replaced with guard clause.

* I am going to

* Turn into the joker.

* Removed inconsistent indentation

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-02-27 18:24:07 -05:00
QwertytofortyGitHubBurzahLucHenri215
 		6910d716dd Adds the modsuit Chameleon Module (#23411) 
* Adds the modsuit Chameleon Module

* Update code/datums/uplink_items/uplink_general.dm

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

* Update code/datums/uplink_items/uplink_general.dm

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

* even clearer

* Update code/datums/uplink_items/uplink_general.dm

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-27 18:17:34 -05:00
ChristasmurfandGitHub 7dd4ecf151 Janitorial Drip (#24141) 
* custodial time

* balls ass

* drask glove fix

* drask sleeve adjustment
 2024-02-27 17:37:16 -05:00
synthteeandGitHub 9892dd9fe4 Adds craftable and wearable flower crowns (#24248) 
* deja vu! i've just been in this place before

* PLEASE PLEASE WORK. PLEASE PLEASE
 2024-02-24 19:10:38 +00:00
AylongandGitHub f2223bb122 TGUI Input fixes (#24270) 
* Some tgui input fixes and reverts

Add default to suit sensors and beaker transfer amount.
Revert languages list and paper text inputs

* Some tgui input fixes and reverts

Add default to suit sensors and beaker transfer amount.
Revert languages list and paper text inputs

* Meh
 2024-02-24 18:14:03 +00:00
AylongGitHubAylongS34N
 		ac5add482f [READY] TGUI Input Collection (#23891) 
* List Input refresh

* Modal Alerts

* Text Input

* Number Input

* Split Button

* Renaming

* Alert converts

* Text Input Conversion (Part 1)

And TextArea Autofocus + maxLength

* Text Input Conversion (Part 2)

* AAAAAAAAAAAAAAAAAAAA

* I'm FUCKED

* @GDNgit review changes

* "&#39;" fixes

* Revert TGUI Alert from admin delete

* NumberInput Window size

* CRASH if empty list

* Update code/modules/tgui/tgui_input/list_input.dm

* TGUI Rebuild

* TGUI Rebuild

* Update code/modules/paperwork/faxmachine.dm

* _char

* compile

* Rebuild

---------

Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-19 11:55:01 +00:00
AdrerGitHubHenri215adrermail@gmail.com <adrermail@gmail.com>
 		ffa697f6c5 Fixes invisible suits on Grey, Kidan and Drask (#24169) 
* Fixes invisible suits

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

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

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-19 11:41:13 +00:00
GDNandGitHub 82b863cefd Converts over the missing TGUI input lists (#23859) 
* Converts over the missing TGUI input lists

* last fixes

* num revert
 2024-02-14 21:17:29 +00:00
QwertytofortyGitHubHenri215BurzahDGamerLLuc
 		c398e4a617 Adds 2 cybernetic implants, makes emag_act return TRUE (#23876) 
* Adds 2 cybernetic implants, makes emag_act return TRUE

* the rest of the fucking owl

* yeah that would do it

* remove this

* Apply suggestions from code review

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

* request changes, scaling burn damage, 3 tile range, lowers tech level

* Apply suggestions from code review

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

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

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

* Update scanners.dm

* Apply suggestions from code review

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>

* fuck me

* there are no message admins in ba-sing

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-02-08 12:52:11 +00:00
ContrabangandGitHub 848c717771 More CI for conditionals (#24050) 
* yay

* and thus, it was fixed

* and this fix too, so that the lang server stops complaining

* warrior review
 2024-02-06 18:29:33 +00:00
DGamerLGitHubContrabang
 		79a7558df7 Revives Organ Datumization (#23397) 
* first runthrough lol

* okay make this shit actually work

* nerfs slime people

* fixes

* more changes

* fix

* bim bim bam bam

* ok back in the head becuz i dont give a shit

* Sirryan review

* Sirryan review

* Fixes CI

* Stealthy CI fail

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-01-21 22:23:51 +00:00
QwertytofortyGitHubRyanHenri215
 		192b8224b8 Anomaly core modules for modsuits (#23154) 
* firewall

* shielded part 1

* WIP: Anomaly core modules for modsuits

* icons, vortex

* cryogrenade, nerfs teslawall

* message admins moment

* Update uplink_nuclear.dm

* rnd designs

* now uses the flayer icon state

* Apply suggestions from code review

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

* early returns, barricade types, and comments, oh my

* Apply suggestions from code review

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

* updates desc, remove comment, removes /hardsuit/

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:17:18 +00:00
DGamerLGitHubRyanHenri215
 		db578cdc6f Makes food not a subtype of reagent holders (#23379) 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

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

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

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

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:00:02 +00:00
QwertytofortyGitHubHenri215RyanDGamerL
 		50b6b5e7d1 Changes power gloves to a bio chip, buffs it. (#23622) 
* wip

* it works yipee

* Update code/game/objects/items/weapons/implants/implant_shock.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>

* Did you know, in terms of making me suffer, full conflicts

* Update code/_onclick/click_override.dm

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

* yes

* Update code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-01-14 12:27:37 +00:00
AylongGitHubRyan
 		37879c530b Boxes new sprites & little refactor (#23213) 
* Sprites and little refactor

* idk what i am doing

Maybe refactor

* Sort the boxes

* Matches path

* Script and maps

* Okay... that was a strange decision.

* bathroom parts box

* More boxes

* Henri review changes

* Update toy.dmi

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

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

* Update storage.dmi

* Update boxes.dmi

* True conflict solve

I hope

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-01-06 23:31:36 +00:00
BiancaWilksonGitHubS34N
 		95c86c5bfc Converts no slip into a trait (#23140) 
* makes noslips work

* trait part

* THE REST

* it didnt conflict too much actually

* this was intended, whoops lol

* no more processing

* consistency

* lewc review

* Apply suggestions from code review

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-06 23:29:10 +00:00
DGamerLandGitHub 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
ChristasmurfandGitHub 1e93bf7408 alloweditems (#23637) 2024-01-06 21:49:58 +00:00