cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 10 Branches 2 Tags
dev-docs-readme
Commit Graph

99 Commits

Author SHA1 Message Date
CRUNCH b057000cf5 Fixes Some Minor Typos in Mineral & Glass Lore (#26235) 
* Kills you for a minor spelling mistake

* Update glass.dm
 2024-07-22 07:41:19 +00:00
CRUNCH 8f2b24be32 Lore Expansion Pack: M I N E R A L S ! (#25427) 
* D E E P   L O R E

* Update mineral.dm

* Apply suggestions from code review

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

* Update code/modules/mining/ores_coins.dm

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

* reformatted and added more lore

* Even more lore

* oops

* Update sheet_types.dm

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/mining/ores_coins.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* updates

* Update ores_coins.dm

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

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

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

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

* Update ores_coins.dm

* Update ores_coins.dm

* update

* refactor (again)

* Update sheet_types.dm

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Update code/modules/mining/ores_coins.dm

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

* Apply suggestions from code review

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

* Update bscrystal.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@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-06-12 17:56:45 +00:00
Sadhorizon d3ff8c9921 Resprites lockets, makes necklaces craftable. (#23387) 
* lockets!

* this shouldn't need directionals, actually
 2023-12-11 16:56:44 +00:00
DGamerL 004d7d10b7 Refactors is_hot and fixes some issues from the beaker lighting PR (#22964) 
* Idk what I'm doing

* The is_hot refactor

* Fixes that I forgot to push before making the PR

* Update code/game/objects/items.dm

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

* Contra review

* TODO: Find out why this isn't working

* Removes the signal stuff for now, this works

* Fixes it all

* Add new signal

* Update code/_onclick/item_attack.dm

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

* Contra reivew

* Ayyy it works

* Merge master

* Forgot this one

* Update code/game/machinery/doors/airlock_types.dm

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

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

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

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

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

* Update code/game/turfs/simulated/walls_mineral.dm

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-12-11 16:53:51 +00:00
DGamerL cb511ae725 Fixes it all, I hate it (#23008) 2023-10-30 19:10:39 +00: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
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
Cocacolagua 6f8abfd3f7 fixes empty sandbags (#22071) 2023-08-25 16:17:07 +01:00
Englishformula a5d5086819 Alien Alloy Sprite Fix (#21103) 
* Update mineral.dm

* Update mineral.dm
 2023-06-02 18:07:24 +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
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
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
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
Kugamo d4d4615fe2 Inhand sprites for metal sheets and ores (#17952) 
* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* okay

* fix merge conflict
 2022-06-14 13:34:08 +01:00
Luc b527838507 Fix abductor closet cloning mats (#16985) 
* Update abductor closet to only drop one alloy

* Revert, make it just cost two alloy to make
 2021-11-02 22:07:46 -06:00
AffectedArc07 aed6fed004 Removes some oldcode 2021-06-19 18:56:48 +01:00
joep van der velden 9ef602bb1b TGUI labor claim console. Fix fifty stack dupes 2020-10-18 16:18:38 +02:00
TDSSS 59347d99a1 [Review Ready] New station goal: Bluespace mining tap (#12062) 
* Initial stuff

* Lots of small changes to get this functional

* Objective aspect works

* Fancy sound and icons

* Polishing, tweaks, branch update

* Incorporates review comments, fixes merge conflcits, updates branch.

* Made it work again, after another rebase

* Rudimentary tgui port, UI needs serious prettying up but is functional

* Much prettier TGUI with slider

* More TGUI improvements

* removes code I have absolutely no memory of writing that seems useless

* code cleanup

* Review comments incorporated

* autodoc

* one more autodoc comment

* more review comments

* filler change

* Forgot one

* return value on delete fix

* disregard that, this is better

* now using qdel_list

* Crate now comes with instructions

* adjusted instruction wording

* tgui messed up, fixed now
 2020-10-15 09:31:57 -04:00
Aidenzack1 15522dae9e fixes certain items unable to light plasma sheets (#13871) 
* fixes certain items unable to light plasma sheets

fixes matches, lighters, and candles from being unable to properly light plasma sheets on fire

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm
 2020-07-21 03:34:54 -06:00
AffectedArc07 b65030fec5 I need to learn to read my todos 2020-05-05 10:13:01 +01:00
AffectedArc07 210f8badf4 Makes all global variables handled by the GLOB controller (#13152) 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
 2020-03-20 21:56:37 -06:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
AffectedArc07 8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00: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
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
Mark van Alphen 4446664997 Update labor stacker 2019-05-31 19:37:25 +02:00
Mark van Alphen 45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Fox McCloud 277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
datlo 74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
lass9030 c6af6f56f3 sheet hand icons from existing sprites 2018-11-09 15:21:45 +01:00
TDSSS a89cf91f82 now with 100% less snowflake 2018-11-06 11:42:01 +01:00
Unknown 1cd8d2f98f Surgical Trays 
Adds Surgical Trays
 2018-10-22 17:37:51 -04:00
Mars 984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Mars d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
variableundefined 6b1b38d4f1 Port over tg ore stack and stack merging 
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
 2018-10-09 10:06:03 +08:00
Purpose efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Mars b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Mars 4d3c3b29e4 Quick Regex replace action 
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
 2018-08-15 23:57:46 +02:00
Aurorablade 55c211f144 Lemins Feedback 2018-07-31 16:44:39 -04:00
Aurorablade 1ba0e9c7c4 i am tired 2018-07-31 04:06:57 -04:00