cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,628 Commits 10 Branches 2 Tags
nanomap-render
Commit Graph

20 Commits

Author SHA1 Message Date
Gatchapod 3bfc290063 New Tajaran veil HUDs (#30776) 
* tajblind

* Trayson icons fix

---------

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
 2025-11-06 07:21:48 +00:00
Alan 0789afc973 Remove headlamp from durathread helmet, add durathread hardhat + recipe. (#29991) 
* Remove headlamp from durathread helmet, add durathread hardhat + recipe.

* Add trailing newline.

* Apply PollardTheDragon's whitespace suggestion

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-15 06:35:11 +00:00
YoursTrulyHollow 072bebd088 Drip expansion: Syndicate garment bag (#29764) 
* 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>
 2025-08-02 05:27:06 +00:00
warriorstar-orion af2a3daf22 Migrate /obj/effect/spawner/lootdrop to /obj/effect/spawner/random. (#27445) 
* refactor: Migrate /obj/effect/spawner/lootdrop to /obj/effect/spawner/random.

* set script PR number

* fix broken updatepaths for three course meal

* make filenames unique

* goddamnit

* redirect incorrect icon states

* ugh

* fix typepath fixes
 2024-12-06 15:05:38 +00:00
DGamerL 098b13bb33 Removes the empty type of /snacks (#26010) 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-29 14:46:04 +00:00
tipoima 2abd000e1a Add recipes for crafting and uncrafting skills hud sunglasses (#25525) 2024-06-01 21:49:07 +00:00
Gatchapod 9afec80430 Less scuffed Tajaran veils (#24701) 
* Tajaran enveilening

* Fix load name, swap to Initialize, more OOP

* Addressing reviews, small redoing of desc

* Suggested changes

* changes suggested by lewcc

---------

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-05-17 12:44:34 +00:00
Mikhail Dzianishchyts ba4994d889 Tweak recipes of glasses (#25070) 
* Tweak recipes of glasses

* Allow some sunglasses as ingredient

* Revert time of recipes
 2024-05-02 00:35:39 +00:00
Marm 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
DGamerL 939532d948 Makes Geraniums and Lilies not subtypes of Poppies (#24271) 
* Easy peasy

* Fucking Delta

* Fixes stealth conflict

* Fixes it for real

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-12 13:00:34 +00:00
synthtee 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
Henri215 94cefac7cb Adds jani HUDs from Baystation! (#22654) 
* Adds jani HUDs from Baystation!

* wrong place

* tweak to sprite

* contra review and tmeporary tweaks to the sprite

* finishing the sprites

* tweak to icon alpha and nv sprite

* typo

* conflict part 2

* test

* final adjustments

* DgamerL review

* fixing sprites

* changing name

* name part 2

* DGamerL review part 2

* wrong value

* nope

* equipment and janitorial categories

* Apply suggestions from code review
 2023-12-11 16:52:54 +00:00
Pineapple Salad 8e6defe682 Adds HUD goggles and basic goggles (#22864) 
* Added HUD goggles

* Added HUD goggles and species variants

* Adds HUD goggles with species variants (fixed)

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

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

* makes hud goggles craftable and adds to vendor

* changed dmi name to goggles

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

* Update code/modules/crafting/tailoring.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-11-03 20:27:29 +00:00
warriorstar-orion a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Stokes52 6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
SabreML 76e237edc5 Fixes HUD sunglasses deconstruction (#15444) 
* sunglasses

* Unit test test

* Unit test test tested
 2021-03-14 13:17:20 +00:00
Kugamo 54bd26b470 Adds Salmon Suit (#14419) 
* Adds the Salmon SUIT

* fixed missing pixel
 2020-09-25 16:10:22 -04:00
Kugamo 27edf99e06 Adds rubber ducky shoes (#13996) 
* adds rubberduckyshoes item

* Adds crafting recipe for rubber ducky shoes

2 rubber duckies, 1 sandal using Wirecutters

* Adds icon for rubberducky shoes

* Adds character sprites for rubberducky shoes

* Adds in hand sprites for rubberducky shoes

* removes pointless variable, and I redid the description.

* Adds rubber ducky to the merch console

done since theres normally only 3 ducks on station, giving some more access to duckies I think is warrented. This might be to much.

* Adds species specific sprites for Vox and Drask

* removes pointless list

* moves crafting recipe to clothing category

* Removes entry in merch console, adds entry in prize vendor

* Revert "moves crafting recipe to clothing category"

This reverts commit b80c398b46b3e60a10b78461d753b6ef6e3ac88b.

* Revert "Removes entry in merch console, adds entry in prize vendor"

This reverts commit c4ae6c3767d2d5ad072ae5befcb1f66b99cb6c63.

* Adds entry into arcade prize vendor

* Removes entry in merch console

* adds crafting recipe to clothing category

* removes recipe from misc category

* corrected messed up sound file location

* Updates icons/mob/feet.dmi

* Updates icons\obj\clothing\shoes.dmi

* improved the item icon

* deconflict
 2020-09-16 18:29:49 -04:00
Citinited fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700) 
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
 2020-02-15 13:31:08 -07:00
Fox McCloud eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00