Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit afd1857
Merge: 8b0ff64 ec2c563
Author: Fordoxia <[email protected]>
Date:   Tue Apr 30 03:45:45 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit ec2c563
Author: Zantox <[email protected]>
Date:   Tue Apr 30 02:57:36 2024 +0200

    Add ventcrawl unit-test (ParadiseSS13#24830)

    * Add ventcrawl unit-test

    * Fix linting

    * Solve chair-flipping without HANDS_BLOCKED

    * Remove unit_test_dummy variable

    * Use `isturf` helper in ventcrawl unit-test

    Co-authored-by: Ryan <[email protected]>

    * Update code/modules/unit_tests/atmos/test_ventcrawl.dm

    ---------

    Signed-off-by: DGamerL <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: DGamerL <[email protected]>

commit 3e9c292
Author: PollardTheDragon <[email protected]>
Date:   Mon Apr 29 20:51:19 2024 -0400

    Diverse Traders (ParadiseSS13#24883)

    * Diverse Traders Types

    * Trader Type control, announcements, species spawning

    * Trader Outfits

    * Posh Moth - Posh Cane

    * Landmarks, Trader ID Name Change

    * Trader Shuttle Adjustment - Landmarks for Item Pools

    * Outfit Survival Kit changes

    * Added another refill for the hand labeler due to more cargo

    * Trader Shuttle locker fix

    * Item Stocks, Item Stock Assignments, Box Kits, Love Bottle

    * Mech access, No double mechs, Small box fix

    * Removed Solgov Gunkit from General Pool

    * Spacing

    * Moved traders to not be event subtypes, added documentation to vars

    * Boxed spacing, removed improper

    * Moved postequip, used box variables

    * Lore team requested change - Bolt action instead of AK

    * Changed landmark

    * Moved soviet ammo to minor gear, increased soviet minor gear to 8.

    * Obfuscated Cybersun

    * Lootpool Adjustments

    * Readded Solgov Kit to general pool at low weight

    * Commas!

    * Spelling

    Co-authored-by: Henri215 <[email protected]>

    * Comments

    Co-authored-by: Henri215 <[email protected]>

    * Re-Nulled After_Equip_Job

    * Removed extraneous var spaces

    * Relocated space in trader introduction message

    * Robomoon is now once again Cybersun

    * Impropered Enforcer Kit

    * No more ERT box for non-NT boxes

    * Fixed turbine kit stock part amount

    * Subtyped skrell/unathi suit boxes

    * Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons

    * Reduced weight on arm/esword implant rare items

    * Also reduced arm laser weight

    * Added a couple items to skipjack large - more 'random', filled in reduced weights

    * Path typo fix

    Co-authored-by: Henri215 <[email protected]>

    * Removed trailing / in path

    Co-authored-by: Henri215 <[email protected]>

    * Removed Cheap Breacher suit from inventory

    * Apply suggestions from code review

    Signed-off-by: DGamerL <[email protected]>

    ---------

    Signed-off-by: DGamerL <[email protected]>
    Co-authored-by: Henri215 <[email protected]>
    Co-authored-by: DGamerL <[email protected]>

commit 417d6fe
Author: Luc <[email protected]>
Date:   Mon Apr 29 20:50:35 2024 -0400

    Makes kudzu much more likely to entangle you (ParadiseSS13#25167)

    * lets kudzu entangle you

    * Increase buckle time

    * Apply suggestions from code review

    Co-authored-by: DGamerL <[email protected]>

    ---------

    Co-authored-by: DGamerL <[email protected]>

commit 48db11c
Author: Сиротка <[email protected]>
Date:   Tue Apr 30 03:14:26 2024 +0300

    Ash Walkers now Ash Doctors (ParadiseSS13#25207)

    * Ash Walkers now Ash Doctors

    * Update other.dm

commit 6848ee8
Author: S34N <[email protected]>
Date:   Tue Apr 30 01:12:49 2024 +0100

    Updates readme, licence files (ParadiseSS13#25259)

    * test

    * more

    * more stuff

    * images

    * more!

    * sanity?

    * details

    * fix licences, update readme

    * remove GPL disclaimer

    * more docs

    * wiki link

    * spacing tweaks

    * text change

    * wording

    * DM language reference

    * Update README.md

    Signed-off-by: S34N <[email protected]>

    ---------

    Signed-off-by: S34N <[email protected]>

commit 2e4089d
Author: S34N <[email protected]>
Date:   Mon Apr 29 03:07:25 2024 +0100

    Various TG Chat message sorting fixes (ParadiseSS13#25229)

    * Fixes unsorted emotes, announcements, votes, surgery, prayers, ahelp responses

    * Apply suggestions from code review

    Co-authored-by: Burzah <[email protected]>

    ---------

    Co-authored-by: Burzah <[email protected]>

commit 4add53d
Author: Сиротка <[email protected]>
Date:   Mon Apr 29 05:00:34 2024 +0300

    Add alternative Spear recipe for Ash walkers (ParadiseSS13#25208)

    * Add alternative Spear recipe for Ash walkers

    * Update recipes.dm

    * Update code/modules/crafting/recipes.dm

    Co-authored-by: DGamerL <[email protected]>

    * Update code/modules/crafting/recipes.dm

    Co-authored-by: Henri215 <[email protected]>
    Signed-off-by: Сиротка <[email protected]>

    ---------

    Signed-off-by: Сиротка <[email protected]>
    Co-authored-by: DGamerL <[email protected]>
    Co-authored-by: Henri215 <[email protected]>

commit 7f37f93
Author: Сиротка <[email protected]>
Date:   Mon Apr 29 04:33:25 2024 +0300

    fix avoiding powerfist antidrop (ParadiseSS13#25274)

    * fix avoiding powerfist antidrop

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

    Co-authored-by: HMBGERDO <[email protected]>
    Signed-off-by: Сиротка <[email protected]>

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

    Co-authored-by: 1080pCat <[email protected]>
    Signed-off-by: Сиротка <[email protected]>

    ---------

    Signed-off-by: Сиротка <[email protected]>
    Co-authored-by: HMBGERDO <[email protected]>
    Co-authored-by: 1080pCat <[email protected]>

commit 83c9d88
Author: Rayforx <[email protected]>
Date:   Mon Apr 29 00:21:48 2024 +0200

    Blood level QoL for vampires (ParadiseSS13#25075)

commit a50683e
Author: Qwertytoforty <[email protected]>
Date:   Sun Apr 28 18:03:14 2024 -0400

    Adds the SPRK-12 Energy Pistol (ParadiseSS13#24869)

    * Adds the SPRK-12 Pistol

    * I Was improper and forgot to name it right

    Co-authored-by: Luc <[email protected]>

    * Apply suggestions from code review

    Co-authored-by: Henri215 <[email protected]>

    * check it

    * Update gun.dm

    * less copypasta

    * Apply suggestions from code review

    Co-authored-by: Henri215 <[email protected]>
    Co-authored-by: warriorstar-orion <[email protected]>
    Signed-off-by: Qwertytoforty <[email protected]>

    * early return

    ---------

    Signed-off-by: Qwertytoforty <[email protected]>
    Co-authored-by: Luc <[email protected]>
    Co-authored-by: Henri215 <[email protected]>
    Co-authored-by: warriorstar-orion <[email protected]>

commit fb027f7
Author: DGamerL <[email protected]>
Date:   Sun Apr 28 22:57:26 2024 +0200

    Changes the `is_changeling` and `is_mindslave` procs into proper defines (ParadiseSS13#25212)

    * Changes these procs into proper defines

    * Henri review

commit fc7acc4
Author: Burzah <[email protected]>
Date:   Sun Apr 28 13:05:39 2024 -0700

    adjusted logic for humanize_spider (ParadiseSS13#25286)

commit a42bacb
Author: BiancaWilkson <[email protected]>
Date:   Sun Apr 28 15:53:29 2024 -0400

    fifty percent off deal (ParadiseSS13#25243)

commit 057e9f1
Author: Code-Lyoko0 <[email protected]>
Date:   Sun Apr 28 14:51:34 2024 -0500

    Informs Deathsquad that the bomb has been armed during Epsilon Alert. (ParadiseSS13#25242)

    * informs the Death Squad that the bomb has been armed during Epsilon Alert

    * Contra review, properly qdel'ing the radio on destory

commit 6fa7a48
Author: Contrabang <[email protected]>
Date:   Sun Apr 28 15:48:13 2024 -0400

    ibheriewfofi0wnmfeionfm (ParadiseSS13#25294)

commit daa368c
Author: Qwertytoforty <[email protected]>
Date:   Sun Apr 28 15:48:00 2024 -0400

    day 1 shadow tweaks (ParadiseSS13#25290)

commit 36f7c43
Author: larentoun <[email protected]>
Date:   Sun Apr 28 06:01:16 2024 +0300

    Better Gas Scans (Chatbox and Colored!) (ParadiseSS13#24975)

    * feat: Better Gas Analyzer AND TGUI!
    ss220-space/Paradise#2333
    ss220-space/Paradise#2461
    ss220-space/Paradise#2522

    * rename atmos helpers

    * remove tgui

    * more fixes

    * better act self

    * now scanner finally works again

    * what if we want turf beneath the target?

    * fix chatbox

    * color code the gases

    * unnecessary stuff removal

    * ghosts can now scan portable atmospherics

    * better code

    * do we really need to know that?

    * change colors

    * add a space to separate gases from other info

    * update tgui bundle

    * update dark-theme CO2 color

commit 1d4d95a
Author: Contrabang <[email protected]>
Date:   Sat Apr 27 21:43:58 2024 -0400

    yes (ParadiseSS13#25297)

commit a3e43a3
Author: warriorstar-orion <[email protected]>
Date:   Sat Apr 27 20:06:39 2024 -0400

    fix: null check during morph eat (ParadiseSS13#25291)

commit 8b0ff64
Merge: c75279f 7ab24d6
Author: Fordoxia <[email protected]>
Date:   Fri Apr 26 22:42:06 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit c75279f
Merge: 8c70410 5b8ae44
Author: Fordoxia <[email protected]>
Date:   Fri Apr 26 16:23:32 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 8c70410
Merge: 339ded7 67cba07
Author: Fordoxia <[email protected]>
Date:   Tue Apr 23 03:22:48 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 339ded7
Merge: 8481f50 f12f75c
Author: Fordoxia <[email protected]>
Date:   Mon Apr 22 01:52:33 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 8481f50
Merge: 5b793c3 4f8d91a
Author: Fordoxia <[email protected]>
Date:   Sun Apr 21 21:54:14 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 5b793c3
Merge: fee098a 79e957b
Author: Fordoxia <[email protected]>
Date:   Sat Apr 20 01:54:46 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit fee098a
Merge: b355d57 950ce9f
Author: Fordoxia <[email protected]>
Date:   Thu Apr 18 14:41:47 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit b355d57
Merge: 7940ed0 95efc8f
Author: Fordoxia <[email protected]>
Date:   Mon Apr 15 00:03:57 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 7940ed0
Merge: 08681f7 41469cf
Author: Fordoxia <[email protected]>
Date:   Sat Apr 13 16:54:55 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 08681f7
Merge: 55e1c1b fe74786
Author: Fordoxia <[email protected]>
Date:   Thu Apr 11 02:40:18 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 55e1c1b
Merge: 87abf3b cb691a0
Author: Fordoxia <[email protected]>
Date:   Sun Apr 7 20:00:48 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 87abf3b
Merge: 3f2715d 61c8d30
Author: Fordoxia <[email protected]>
Date:   Sat Apr 6 16:30:51 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 3f2715d
Merge: 98c6f80 298f228
Author: Fordoxia <[email protected]>
Date:   Tue Apr 2 01:30:25 2024 +0100

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 98c6f80
Merge: cb01bae 543b8d4
Author: Fordoxia <[email protected]>
Date:   Fri Mar 29 01:57:32 2024 +0000

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit cb01bae
Merge: f58ef90 35ca57c
Author: Fordoxia <[email protected]>
Date:   Thu Mar 21 20:29:23 2024 +0000

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit f58ef90
Merge: a7f1ecb 0c25bf4
Author: Fordoxia <[email protected]>
Date:   Sat Mar 16 19:52:05 2024 +0000

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit a7f1ecb
Merge: e4f5bb9 59af335
Author: Fordoxia <[email protected]>
Date:   Thu Mar 14 23:46:09 2024 +0000

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit e4f5bb9
Merge: f349026 7d57c53
Author: Fordoxia <[email protected]>
Date:   Tue Mar 12 18:05:14 2024 +0000

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit f349026
Merge: 589afda 5598144
Author: Fordoxia <[email protected]>
Date:   Tue Mar 12 01:16:52 2024 +0000

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit 589afda
Merge: bddc3d4 84dff25
Author: Fordoxia <[email protected]>
Date:   Mon Feb 5 01:16:14 2024 +0000

    Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

commit bddc3d4
Merge: 2025536 e8e51d2
Author: Fordoxia <[email protected]>
Date:   Sun Jan 28 19:35:07 2024 +0000

    Merge branch 'ParadiseSS13:master' into master

commit 2025536
Author: Fordoxia <[email protected]>
Date:   Sat Sep 23 02:11:35 2023 +0100

    And reverting yet again

commit 865b5a6
Author: Fordoxia <[email protected]>
Date:   Sat Sep 23 02:11:06 2023 +0100

    Reverting again because Ebba told me to

commit 71dcb47
Author: Fordoxia <[email protected]>
Date:   Sat Sep 23 02:05:42 2023 +0100

    Reverts a broken revert

commit 99a72f1
Author: Fordoxia <[email protected]>
Date:   Sat Sep 23 02:02:35 2023 +0100

    Reverts double-feature PR

commit 96f0888
Author: Fordoxia <[email protected]>
Date:   Sat Sep 23 01:55:30 2023 +0100

    Briefcase Full of Cash buff

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

commit fd28b08
Author: Fordoxia <[email protected]>
Date:   Fri Sep 22 23:45:48 2023 +0100

    Fixing some minor typos for cyborg upgrade flavour text

    Throws in some missing apostrophes, capitalisation, and the letter "s."
  • Loading branch information
Fordoxia committed Apr 30, 2024
1 parent c659e53 commit f5695c9
Show file tree
Hide file tree
Showing 130 changed files with 2,411 additions and 676 deletions.
Binary file added .github/assets/book-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/book-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .github/assets/compiles-sometimes.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/discord-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/discord-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/light-dark template.psd
Binary file not shown.
Binary file added .github/assets/made-in-byond.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions .github/assets/made-with-crayons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/paradise.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/web-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/web-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/wiki-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/wiki-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions COPYING

This file was deleted.

File renamed without changes.
Loading

0 comments on commit f5695c9

Please sign in to comment.