mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-31 20:53:34 +00:00
072bebd088
* repair droid sprite update
* biochips
* syndie drip 1
* Update code/game/objects/items/weapons/storage/garment.dm
Indeed, my apologies
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/head/beret.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/neck/cloaks.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* merge conflict resolve attempt 1
* Merge conflict resolve attempt 2
* mergre conflict RESOLUTION attempt 3
* Revert "mergre conflict RESOLUTION attempt 3"
This reverts commit 06e0f77564.
* Merge conflict resolution attempt 4: hooks edition
* maybe i shouldn't have commented that one thing out
* updated garment bag description, removed stashed change
* removed garment bag contents stashed changes
* removed syndie beret stashed changes
* removed syndie cloak stashed changes
* fixing my fuckup part 1
* fixing my shit part 2
* fixing my shit part 3
* fixing my shit part 4
---------
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>