cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 01:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,182 Commits 26 Branches 2 Tags
012a00aafbd18e931d64bf22a4bbe04dffa7ea21
Commit Graph

85 Commits

Author SHA1 Message Date
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
Kyani
586e2e6c4d Job Perks - True Professionals (#29478) 
* ddsadsa

ddsadsa

* moderate again

* revert

* medical first steps

* more work

* lots more work done

* more progress

* finished up

* attack chain linter

* attack chain update

* attack chain work

* fixes + chemist update

* gives comments
 2025-06-13 19:40:29 +00:00
warriorstar-orion
f9ade844c9 Kitchen rework part 1: machines and recipes. (#28277) 
* Kitchen rework part 1: machines and recipes.

* update oldstation

* update updatepaths script number

* fix blank icon test

* remove old deep fryer completely

* fix duped recipes and recipe datum names

* add chef PDA cart to chefdrobe

* nerf grill wood consumption rate

* multiply food for cooking machine rating

* fix runtime

* add cookware to syndie base and oldstation

* remove dupe burger recipe, update syndie/oldstation setups

* nerf potency quality award

* buff burn/ignite times, remove pointless on_fire flag

* more grill woodburn nerf

* meh

* try and unfuck timing issues

* more fixes and icon updates

* more fixes

* more review changes

* fix linter

* disable pcwj debug

* fix grill and deep fryer overlays

* fix timers with no containers

* attempt to fix reagent adding issues

* more cleanups

* allow rped usage

* grammar, null checks, reagent display

* PDA updates, map updates

* fix mats values

* new panel sprites

* recipe fixes, add prep bowl

* revert unused icon file changes

* move this to mesh with smith TM

* remove food quality for now

* New sprites, autochef.

* fix examine text

* reduce oven cook times

* lots of fixes

* fix autochef recipes that start with reagents

* prevent shenanigans

* megapatch 1

* block ingredients behind oven door

* PDA app improvements

* remove unused proc

* fixes for cookbook, descontructions, completed steps

* allow empty containers with a tracker to be claimed

* allow reclaiming

* autochef reliability fixes

* autochef reliability fixes

* fix quality product count

* update updatepaths script

* better stack handling

* more fixes for stacks and reagents

* timers no longer turn off burners automatically

* autochef turn offs and make sure we can see output storage

* add microwave recipe for roundremoving player brains

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* burza review 1

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* fix berry muffin name while i'm here

* grill -> microwave in new tests

* grill -> microwave in new tests, but actually for realsies

* i definitely know what i'm doing

* redundant attack chain setting

* add examine text about clearing buffer

* remove unused vars and start improving docs

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-03-23 04:59:08 +00:00
PopeDaveThe3th
0434d8f06f [LORE] Updates a bunch of manual summaries (#28347) 
* le book

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

Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

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

Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update manuals.dm

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

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
 2025-03-02 18:59:27 +00:00
Pedro
b55bef2ed2 Nanotrasen Career Trainer - REVIVAL (PT1) (#26512) 
* Nct ID

* Preferences, job creation, access and other stuff

* Sprites, defines, hidden job pref and other stuff!

* Missed a comma

* Sprites updated, clothing code, outfit and id

* Fix a small oops

* Data chip + Sechud icon

* Offstation, access, datachip code, ticket autoresponse and a lot of other stuff.

* Typo, spritesheet fixingg and icon color

* Telebaton removed, not allowed to scan ERT IDs, blacklisted some access

* Applies suggestion

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

* Applying Suggestions!

* Forgot to increase the number of slots, oops

* Added a few items that I forgot, applying suggestions.

* Fix check fail?

* Mapping Tools/Icons.

* Office added to all maps, a few modifications to fit.

* Adds ACCESS_TRAINER to who needs it.

* Fixing check fails.

* NCT Beret obj are now where they're supposed to be

* Suggestion

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

* Sprites fix + NCT flag

* Code Suggestion

* Sprite update

* Suggestions

* Diagoras Office, conflict fix.

* Day 1 fixes, suggestions.

* bundle rebuild

* Fixing a few issues.

* Mapping review + Suggestions

* Fixed check fail.

* Conflict fix + You shouldn't be able to insert the NCT chip into an id console

* Fix map conflicts

* Plasmaman icons and Kidan icon fix

* Conflict fix?

* A few changes following feedback.

* Small description changed, as per requested feedback.

* Suggestions/Fix

* Forgot some mapping issues

* Suggestions

* Fixed?

* Fix linters

* More fixes

* aaaaaaaaaaa

* Christa's reviews

* Naming stuff

---------

Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-12-30 21:13:52 +00:00
AffectedArc07
d663dfc3fb [READY FOR TM] R&D Rework Part 2 - Death to the experimentor (#27472) 
* PT1 - Death to experimentor

* I cant fail CI this fast come on

* PT2 - DA -> SA

* CRLF to LF

* Strange icons in the SA now

* Lets give this a go

* AGH

* Dirt

* WORK

* Oops - cere was missing the RD locker

* Map fixes

* Adds delivery chute back

* Warrior review

* Also removes magnetics

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-12-04 17:55:39 +00:00
Henri215
b38c4bbd4c A few description grammar fixes (#27134) 
* Double spaces

* more space and misspelling

* Fixing punctuations

* Not now

* double dots

* Apply suggestions from code review

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-11-10 13:38:28 +00:00
warriorstar-orion
9465b565b8 refactor/ci: enforce mapload in Initialize args (#26878) 
* refactor/ci: enforce mapload in Initialize args

* add new missing mapload arg

* add yet another missing mapload arg

* Update code/modules/power/engines/singularity/particle_accelerator/particle.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-10-23 19:07:46 +00:00
Contrabang
2a0d1c0416 ognerwogner[0ign3we0ifnhwepighn3igbwoigbewo (#25902) 2024-06-14 19:02:44 +00:00
Migratingcocofruit
342eaded5b Adds a General Hydroponics and a Botanist wiki manual to the hydroponics area of each station (#25576) 
* Adds hydroponics wiki manuals for general hydroponics and for the station botanist

* adding the manuals to the maps

* makes title fit the book name and capitalizes the word "handbook"

* adds copies of General Hydroponics to the syndicate space base, preserved terrarium and free golem ship
 2024-06-09 00:52:04 +00:00
Contrabang
ee6068b96a no fungus (#25732) 2024-06-03 03:09:15 +00:00
Contrabang
efd75cda2b Adds wikipage to zombie antag datum + minor fix (#25712) 
* Adds wikipage to zombie antag datum + minor fix

* oops

* okay send it
 2024-05-31 20:25:12 +00:00
Contrabang
bc0c8344cf Adds Zombies (Admin-spawn) (#25381) 
* fuck it good enough

* Apply suggestions from code review

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

* TRIPLE-REVIEW

* this should do it

* wow

* bruh

* FIX

* fix

* yeah

* sirryan review

* aaaaa

* Apply suggestions from code review

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

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-05-31 02:17:31 +00:00
JimKil3
0c25bf4a21 Cloning Rework (#21683) 
* guts the cloning pod

* guts cloning console (except the tgui)

* clonescanner, more gutting, linkage

* reagent stuff

* `cloning_data` datum

* scanner inserting/removing

* scanning logic

* auto-linkage

* `get_cloning_cost()` in its entirety

* logic for which limbs to grow

* RefreshParts() and insert_organ()

* removes misinformation

* robot parts

* more organ insertion logic

* more organ code :D

* create_clone

* beginnings of clone logic

* cloning addl. stuff

* cloning finalization

* fixes CI?

* whitespace fixes (regex edition)

* ejection logic

* Update code/game/machinery/clonepod.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* stuff

* stuff 2

* update_icon_state stuff

* clonepod TGUI

* organ fix yipee

* cloning console UI beginnings

* cloning console main menu

* reagents stuff

* beginning of damage tab

* damages menu skeleton

* aiuhgugh

* splits up code

* ejecting patient updates ui

* contra reviews

* temp fix for CI

* tgui finished? (clueless)

* Cloning :D
it's done

* manual & tweaks

* more feedback!

* cooldown
because you can spam the fuck out if it otherwise and it's really loud for the ghost

* oops

* tweaks

* edits EVERY MAP OH GOD

* no link stuff

* oops

* Apply suggestions from code review

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

* Apply suggestions from code review (pt. 2)

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

* Update code/game/machinery/computer/cloning.dm

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

* Apply suggestions from code review

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

* dgamer review

* Update code/game/machinery/clonepod.dm

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

* Apply suggestions from code review

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

* henri stuff

* makes it compile

* builds tgui (oops)

* rebuilt bundle i guess?

* not stale i swear

* fixes

* whoops

* countdown stuff

* sirryan review pt. 1

* sirryan review pt 2

* every day i'm shuffling (or something idk)

* wasdfhdfg

* sean clonepod.dm changes

* update_icon(UPDATE_ICON_STATE)

* Update code/game/machinery/clonescanner.dm

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

* icon stuff

* map weirdness

* henri disks

* unfucks maps?

* cc maps

* eject button

* Apply suggestions from code review

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

* Update code/game/machinery/clonepod.dm

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

* dgamer review 2

* ourgh

* dgamer review 3

* waaaah

* fixes access locks

* fixes
Fixes the numbers issues (and no feet hopefully?)

* re-adds feet

* more fixes yipee

* un-biomass

* fixes ghost stuff

* exploit fix

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@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: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-16 16:51:13 +00:00
larentoun
c5c911d252 [DOWNSTREAM] Cyrillic Support v2 (#24075) 
* cyrillic fixes cbdad6f11f

* fix: remove control characters

* utf-8 support

* more fixes

* spellbook to utf8

* Update code/modules/research/server.dm

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

* Update code/modules/research/server.dm

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

* Update code/modules/paperwork/paper.dm

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

* Update code/modules/paperwork/folders.dm

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

* Update code/modules/mob/mob_say_base.dm

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

* update formatting

* fix ai alerts

* fix spaceheater

* fix noticeboard

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-03-11 09:35:08 +00:00
Bjamcham
3d8c2909f5 Atmospherics Manual Improvement (#22671) 
* Misinformation begone

* Turns out I can't spell

* I am so tired of hallucinations

* Revert "I am so tired of hallucinations"

This reverts commit 15b2eeff5f.

* Code format improvements

* Final fixes

* Final FINAL fix
 2023-10-09 20:38:27 +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
Silverplate
622dc36357 Updates the Supermatter Engine Book to act as a pocket guide for SM events (#22072) 
* SM book updated (it only took like 5 years)

* Grammar police reviews

* Updates book to reflex hotfix
 2023-09-01 23:13:04 +01:00
Henri215
42d1758b2e Fixing common spelling mistakes part 2 (#20360) 
* Fixing common spelling mistakes part 2

* "supressed"
 2023-02-08 21:20:35 +01: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
Shadow-Quill
6d6af3742e Adds descriptions to library manuals (#18380) 
* Adds descriptions to library manuals

* I swear, I can type!

* Apply suggestions from code review

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

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

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-07-16 21:46:09 -05:00
Sirryan2002
f2813a6730 Complete Library Overhaul Part 1 (#17832) 
* first edits

* more commits yay

* more changes

* Update paradise.dme

* changes

* more edits

* more edits

* changes

* more changes

* changes

* more stuff

stuff

Update tgui.bundle.js

* FUCK

* Many UI changes

* Update Lib Computer UI and Correct Map Issues

* squashed commits :)

Guts Old Book/Manual Code and Reworks it
final (almost) touches

* this should pass tests now

* fixes random ruin having a removed object

* adds review suggestions

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

* squashed commits :)

update schema
adds python requested changes
implements proper python & sql scripts
applies some requested changes + minor fixes
bump SQL version to 40

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* applies requested changes from code review

* lets pass some tests today

more fixes

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* more requested changes fulfilled

* should fix map issues + a couple other things

* fixes & sanitization stuff

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* updates UI and implements more requested changes

* mother of bug fixes & UI cleanup

* removes unused code

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* fixes

* adds GC checks

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* requested changes + TGUI Cleanup and Styling

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-07-09 14:55:12 +01:00
LightFire53
9a4f60524c Adjusts Cook Book (#15703) 
* Adjusts Cook Book

Brings the chef's cook book sprite more in line with the rest of the sprites.

* Update library.dmi

Extends meat further down the bone. Yummy.

* Last time, I swear

Using feedback from FalseIncarnate

* code parity

At the request of dearmochi
 2021-03-28 11:59:28 +01:00
Darkmight9
8782c2ca32 Culinary QoL update (#14610) 
* Culinary QoL update

* Changed the culinary tool apron sprites
 2020-10-17 13:30:44 -04:00
AffectedArc07
1c1b4fa8c7 Makes book DRM apply to printed books 2020-07-23 12:42:28 +01: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
Bryan
ff585ccd04 Code and Sprite changes 2020-03-02 21:29:45 -07:00
Kyep
fc650c273a domain links update 2 2019-12-16 18:55:51 -08:00
datlo
fc18cdf72d remove throwforce on space law 2019-01-23 14:23:21 +00:00
datlo
9a7147423e added throwforce 2019-01-22 01:41:24 +00:00
datlo
f2b1d55b37 Add force to books, extra to space law 2019-01-22 01:21:32 +00:00
Purpose
ea74920535 no no no no cyberiaaaaad 2018-10-05 20:57:41 +01:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
shugnk
bbd681e369 Manuals.dm fix 
Fixed Dat descriptions and Iframes. Also fixed nanotrasen letter case
 2018-02-25 20:02:48 -05:00
shugnk
a0d65887b3 Delete manuals.dm 2018-02-25 20:01:20 -05:00
shugnk
cd90c3a328 fix again 2018-02-25 19:55:08 -05:00
shugnk
7325527024 Fix DAT and Iframes for Books 
With NanoTrasen changed to Nanotrasen as well
 2018-02-25 19:52:48 -05:00
Sam
fca8a46c49 Fixes errant improper capitalised references 2017-06-14 08:00:18 +01:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
TullyBurnalot
2dce5ec8f1 Bureaucracy Update 
- Added Fax Guide to NT Rep, IAA, Captain, HoS and HoP Lockers
- Added Tape Box, with 6 Tapes, to NT Rep and IAA Office
- Added Recorder to NT Rep Locker
- Printers now start off with 60 toner
- Printers now alert nearby people when butts are copied
 2016-07-07 20:24:07 +01:00
Kyep
55d0472268 Initial checkin 2016-06-25 00:35:00 -07:00
pinatacolada
4dfbd113bc command soap books 
just adds one to the blueshield's, nt rep's, IAA, captain's, and HoP's
offices. das all

🆑 pinatacolada
rscadd:Adds Command SOP books
/🆑
 2016-06-04 15:49:49 +01:00
pinatacolada
b30b826e21 forgot legal and standard sop oops 2016-04-11 16:10:05 +01:00
pinatacolada
b75bc658db typo 2016-04-10 21:44:31 +01:00
pinatacolada
06d7c325ea thought i had this fixed 2016-04-10 21:21:27 +01:00
pinatacolada
b5768f485c Adds SOP books 
Adds SOP books to the corresponding departments and department head's
offices. Rep and IAA have a brand spanking new shelf with all the SOP
books.

Also right now it's using generic book sprites because I couldn't sprite
even if my life depended on it, maybe someone could sprite something
nice for them?

Also fixed a random < that was just kinda there out in nowhere in an
atmos book
 2016-04-10 21:16:29 +01:00
Markolie
e96103a02b Fluff item clean-up 2015-09-25 04:31:30 +02:00
Fox-McCloud
d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -04:00
Artorp
046096684b Revert "Change space law iframe wiki link" 2015-03-27 23:53:52 +01:00
Artorp
ef2c939872 Change space law iframe wiki link 2015-02-20 19:20:21 +01:00