Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The Cardborg Expansion DLC! (#25011)
* 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
* Cardborg suit icons and code trimming.
icons added for cardborg suits, helmets pending.
* Added cardborg head sprites
* Added head sprites for equip
* Added Body Sprites
* Spraypaint
* suffering
* Heavy cooking
* Update crayons.dm
* Update cardborg_suit.dm
* DOG FASHION WOOO!
* Species sprites
* prettification
* indentation grr
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/clothing/suits/cardborg_suit.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/clothing/suits/cardborg_suit.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/objects/items/crayons.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/objects/items/crayons.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/dog_fashion.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* early return
* borgimorph desc
* Atomisation
* Helmet nerf
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* some work
* More work
* Removed commented out stuff
* associative list
* LISTLESS!
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* usr > user
* oops
* huff
* I need caffine
* Update crayons.dm
* Update code/modules/clothing/suits/cardborg_suit.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>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
* Squashed commit of the following:
commit f49219c0197cdaba877c1408a21216df794bd930
Merge: 4d7a67497c 5040dc286e
Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Date: Fri May 3 01:25:48 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit 5040dc286e8803d1361de6207db2c49b50b82588
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Fri May 3 01:49:04 2024 +0200
Makes mentor PMs show up as mentor PMs again (#25351)
commit fe59ff5c3d73cf51b71f80630a40bc056e45a60f
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Thu May 2 19:33:24 2024 -0400
adds more hand keybinds (#25225)
commit b14830c85af1f09df66432fd50648fcd5b580943
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Thu May 2 18:17:19 2024 -0500
Timer log now includes the function called (#25308)
commit 073ad533faeb86eb7e056b8afd71e38afaae1485
Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Date: Thu May 2 18:38:45 2024 +0100
Autodocs robot_mob.dm. Removes an unused proc. (#25331)
* Autodoc. Removes unused proc.
* removes a space
* Update code/modules/mob/living/silicon/robot/robot_mob.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
* Update robot_mob.dm
* Update robot_mob.dm
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit 02a09a7c7f00b0466608df536282cb88b5415706
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Thu May 2 13:17:12 2024 +0100
Upgrades TGS build script to actually build RUSTG (#25340)
commit 2144a93627b3ffc77849e9d559acd8e898be7e8e
Author: Henri215 <77684085+Henri215@users.noreply.github.com>
Date: Thu May 2 08:52:00 2024 -0300
Mining charges, second try! (#24790)
* mining charges
* Apply suggestions from code review
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
* span class
* deconstruct comment update
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* ops
* Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mining/equipment/mining_charges.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit d587effe2c728dc028a8f15952a287ae0b983cc1
Author: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Date: Thu May 2 12:37:44 2024 +0100
Beret + softcap .dmi split (#25314)
* beret softcap dmi split
* icon rename
* dme crlf to lf
* tsf cap fixes
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
* vox cap icon name
* remove beret subtype on fluff
* Update code/modules/clothing/head/soft_caps.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
---------
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 15e7fcdb3fdd482bc1c48264eee2964110cbff63
Author: Divulf <134484326+Divulf@users.noreply.github.com>
Date: Thu May 2 21:59:35 2024 +1200
Improves barsigns and makes them buildable. (#24685)
* Improves barsigns and makes them buildable.
* Requested fixes.
* fingerprints and a parent call on attack_hand() (sure hope this doesn't break anything)
* More fixes. (the change to barsigns.dmi is removing a bunch of almost-transparent pixels on the mead bay sign that shouldn't have been there)
* Even more fixes.
* Better code and sprite fixes.
* early returns
* better
* more
* switch
* qwertyuiop
* whoops
* maps are stupid
* mcramon sprites :o
* i hope mapmerge works this time
* i hope mapmerge works THIS time
* zrsxdctfhghfcdszzsxdgcfhv
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
commit fd30c120473a58c61e2e2741b9a090e885890441
Author: Charlie Nolan <funnyman3595@gmail.com>
Date: Wed May 1 20:04:42 2024 -0700
Secondary goals will now refuse to generate if messaging is offline. (#25170)
* Secondary goals will now refuse to generate if messaging is offline.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
---------
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit 13c583d2bf755f43701f0acf38eafaa545950033
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Thu May 2 04:57:26 2024 +0300
Sanitize empty values in `file2list()` (#25255)
* Sanitize empty values in `file2list()`
* seperator
---------
Signed-off-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
commit 87aef935869e4a3eaf5192c69ac3a8e0068afc5d
Author: asciodev <81930475+asciodev@users.noreply.github.com>
Date: Wed May 1 20:36:02 2024 -0400
Allow borgs to use holopads (#25094)
* Allow borgs to use holopads
* Revert kludge cyborg icon fix in favor of sane fix
* Further remove cyborg hologram kludge
For cyborgs, a false value was previously set for the safety argument
when calling `/proc/getHologramIcon` (from commit 17c96bc24d). This was
because the `icon/A` parameter was mistakenly set to `robot.icon`, which
caused a runtime error to occur when `Height()` is called on it in line
1008, preventing cyborg holograms from appearing. Setting a false safety
value made use of the so-conditional `new(A)` call on line 1003, which
created a new icon from the `robot.icon` string. This kludge prevented a
runtime and made cyborg holograms appear. The kludge was removed in
commit dbb8851ae3, but the false safety value remained. This commit
fixes that.
* Update code/game/machinery/hologram.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>
commit ba4994d8897746290cce87b6ae0ac1610f55747d
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Thu May 2 03:35:39 2024 +0300
Tweak recipes of glasses (#25070)
* Tweak recipes of glasses
* Allow some sunglasses as ingredient
* Revert time of recipes
commit 5ca09c7fe7678f737aa333bf2c1653859401ba1f
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Thu May 2 03:27:10 2024 +0300
Don't walk without gravity while being space drugged (#25248)
* Don't walk without gravity while being space drugged
* Update code/modules/reagents/chemistry/reagents/drugs.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
---------
Signed-off-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
commit 24726c60fec6104f24b9ee3db58980414d2f8a6d
Author: Adrer <erwin@lombok.demon.nl>
Date: Thu May 2 02:20:07 2024 +0200
Moving pulled objects as a borg checks if the turf is adjacent to you. (#25253)
* Move_Pulled now checks for adjacency of the turf you are moving something to.
* Move comment to correct line.
* Update code/modules/mob/mob_movement.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
commit 31390ff2e1dd63f26a89b6d4944610f206ec4ae4
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date: Wed May 1 20:14:23 2024 -0400
Check against current mob for admin keybinds (#25341)
commit 45b0f34d9566b01c2fb610a5f01f153ee189f1d4
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Thu May 2 03:06:23 2024 +0300
Don't check side pressure if filter isn't.. filtering (#25019)
commit 50a986b8dea60b90106ce6ae7c0d3610e02ab921
Author: Charlie Nolan <funnyman3595@gmail.com>
Date: Wed May 1 17:04:50 2024 -0700
Makes tesla movement pretty (#24786)
* They hate how easy this is
* No more deciseconds
* Intermediate code
* Made tesla movement pretty.
* Lint.
* Update code/modules/mob/mob_movement.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Review comments.
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
commit e19559ad5480e5e870f8a487fcaef22c2335e980
Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Date: Thu May 2 01:01:24 2024 +0100
The Gibber Now Drops 6 Meat Instead of 3 When Gibbing. (#25287)
* Update gibber.dm
* extra
commit 1feb21eed13f592809fef6c2c550859cbf32225b
Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Date: Thu May 2 00:58:35 2024 +0100
[FIX] Cyborgs With Guns Can Now Perform Executions (With Guns!). (#25275)
* borg execution time
* Update gun.dm
* Update gun.dm
* Update gun.dm
commit 41eff52fac1d647d7b59cdcd7c862552d4076976
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Thu May 2 01:55:38 2024 +0200
Renames most processing SS' to the convention of `SS[SS name here]` (#25302)
* Renames most processing SS'
* Contra review
commit 271d67d237338fbb396484d5c7350301e9b6a26c
Author: Deniz <66401072+Oyu07@users.noreply.github.com>
Date: Thu May 2 02:54:00 2024 +0300
Adds MARK: to some comments (#25184)
* robot_upgrades
* disability
* airlock
* mecha
* Abcudtor
* Forgot a space here
* Some style changes + additions
* removed a no comment
* comment change
* empty
* empty again
dont dare look insde
* ault
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 4a1f3967076c0f6bb973e511a406084e2f238fc2
Author: dearmochi <1496804+dearmochi@users.noreply.github.com>
Date: Thu May 2 08:52:14 2024 +0900
Grant TRAIT_NOFIRE while cloning (#25327)
* Grant TRAIT_NOFIRE while cloning
* Update code/game/machinery/clonepod.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
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>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
commit f8ebba6ed100f98d74f4404da6422b267f567688
Author: Burzah <116982774+Burzah@users.noreply.github.com>
Date: Wed May 1 16:49:05 2024 -0700
Adds logging for thrall deconversions (#25305)
* thrall deconversion logging inside water.dm
* moves logging to vamp_thrall.dm instead
commit f0209d975b070fc82ebdb92ea2bdc0e603c72a48
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Wed May 1 19:46:42 2024 -0400
ion scatter gets 2 more pellets and 5 degrees more spread (#25269)
* ion scatter gets 2 more pellets and 5 degrees more spread
* mech ion as well
commit 96aa08823c50fe3b6b4cd9142544d9c000b74d6d
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Thu May 2 01:23:31 2024 +0200
Adds it (#25254)
commit af7f35a0feab8879e5d98b7f81497a63c8502ba0
Author: Arthri <41360489+Arthri@users.noreply.github.com>
Date: Thu May 2 07:23:26 2024 +0800
Remove tgui say error (#25273)
* Remove the error
* Build and update tgui
* Restore precautionary if statement
* Build and update tgui
* trigger ci
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
commit a3a1be49b0b7a86048f26f9edc612f50858ffeec
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Wed May 1 19:23:19 2024 -0400
modsuits have the same virus protection as space suits / biosuits (#25310)
commit daf76d3aaa84b801419c9b0d72631b01495dc326
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Wed May 1 19:23:09 2024 -0400
gives lavaland plants 50 potency (#25322)
commit 55ed33a253630622e507f4557ed635c7768b6927
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Thu May 2 01:23:03 2024 +0200
Changes incorporeal_move to defines (#25319)
* Changes incorporeal_mvoe to defines
* Lets the switch use defines too
commit f2dd4f6595fc086dbb9fe36f7f61b9539e7e3675
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Wed May 1 19:22:59 2024 -0400
fix shield generators on zlvl change (#25318)
commit 3e5a3ea35cbc281beec7e0fd506b069e462753f2
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date: Wed May 1 16:37:44 2024 -0400
works (#25337)
commit f97a9ee9346eeb758da8b444dc48bfee039e6c6e
Author: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Date: Wed May 1 19:05:54 2024 +0100
NanoMap Auto-Update (Wed May 1 01:16:06 UTC 2024) (#25329)
Co-authored-by: NanoMap Generation <action@github.com>
commit 9d2c9d9ed1424c8d297e9a5f72feabb48113fa26
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Wed May 1 13:27:37 2024 +0200
Removes a variable that is only set once (#25003)
* One of the variables of all time
* Oyu review
commit 44fb00ca25010083a4de517da9c769063c1be1f0
Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Date: Wed May 1 13:42:57 2024 +0300
Qol + fix for mecha (#25206)
* Qol + fix for mecha
* Update code/game/mecha/mecha.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/mecha/mecha.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 86530f4e3efa9ed82ccb1c57cb5aa3a26bc43318
Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Date: Wed May 1 13:40:48 2024 +0300
BUFF: Mining Grenade launcher (#25204)
* BUFF: Mining Grenade launcher
* Update weapons.dm
commit 14ce47830dc39157ead1355f18098bee658a87c7
Author: Charlie Nolan <funnyman3595@gmail.com>
Date: Wed May 1 03:39:01 2024 -0700
Reduce the chance of getting no changes to a stat when mutating plants. (#25179)
* Reduce the chance of getting no changes to a stat when mutating plants.
* Update code/modules/hydroponics/seeds.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 7daf219ec0db1b4de86da6470f26ca68012c9e3f
Author: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Wed May 1 13:37:08 2024 +0300
More Crowbar Acts (#24986)
* crowbar acts part 1
* livings checked
* convert istypes to tool behaviour
* solars
* use tool_volume
* Update code/modules/research/server.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com>
* Update code/modules/power/generators/portable generators/pacman.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com>
* return
* return returns
* Update code/modules/mob/living/simple_animal/bot/mulebot.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com>
* Update code/game/objects/structures/janicart.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com>
---------
Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 4d7a67497c4e6d1af5af761af0d3027ab57b37b1
Merge: afd185773a a2e7d95306
Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Date: Wed May 1 04:00:48 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit a2e7d95306fc3215e6b61271790e2573666112ae
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Tue Apr 30 22:41:03 2024 +0100
Moves a custom item to the right file (#25325)
commit 6ea2f09570835e3db62ab7dee0ae3cd6fd829646
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Tue Apr 30 20:41:45 2024 +0200
Removes a rogue # (#25313)
commit 9271d9e106fa184c9ad7ff0991f469f5d3ca2528
Author: Charlie Nolan <funnyman3595@gmail.com>
Date: Tue Apr 30 05:29:19 2024 -0700
Added tracking of when a secondary goal is handed out. (#25168)
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
commit 4ea0bbd6da7f606df6def1e3d715ed1afe447c05
Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Date: Tue Apr 30 13:07:18 2024 +0100
Tweaks Farragus Robotics, Adds a Corpse Delivery Chute! (#25090)
* 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
* Makes farragus less bad
* Tweaks
* Reconstruction
* Tweaks
* Merge Deconflict AGAIN
* Update cerestation.dmm
* More deconflictation
* Update cerestation.dmm
commit 107950f50ef0238e0a025c654cf5af72ae451dc6
Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Date: Tue Apr 30 12:51:15 2024 +0100
Removes Advanced Reagent Scanner from Service & Medical Cyborgs, Transfers Functionality to Innate Reagent Vision. (#24457)
* Update robot_modules.dm
* Adds advanced reagent vision
* rounding
* Update code/datums/outfits/outfit_debug.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/clothing/clothing.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update atoms.dm
* This one hyphen will kill me if I don't fix it.
* Update code/game/atoms.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/atoms.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update atoms.dm
* Update code/game/atoms.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
* Update code/modules/clothing/clothing.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
commit 773ee4afedc6cdc771af65097db11c16432182ee
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date: Tue Apr 30 12:45:41 2024 +0100
Update the TGUI conflict merge resolution to properly commit rebuilt bundles (#25246)
* update the tgui conflict merge process
* tidy this
commit 94b5d2203457d739faeec2cbe6d2b95c1c75b29d
Author: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Tue Apr 30 14:40:41 2024 +0300
Records Multiline (#24991)
* pre-wrap for labeledlist
* multiline for pdas
* consoles fix
* update tgui
* update tgui bundle
commit 54d563ada1b9e48e0fcca0591319f01813d98aef
Author: Charlie Nolan <funnyman3595@gmail.com>
Date: Tue Apr 30 04:23:16 2024 -0700
Reverse direction of requests console messages. (#25169)
Also fixes a bad error message.
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
commit afd185773a3a82f850c3ea055ca01c5be17de5b3
Merge: 8b0ff64cc0 ec2c5638fc
Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Date: Tue Apr 30 03:45:45 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit ec2c5638fc1dadf785450ad95bdd9c95ec44b83f
Author: Zantox <vetle.neumann@protonmail.com>
Date: Tue Apr 30 02:57:36 2024 +0200
Add ventcrawl unit-test (#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 <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/unit_tests/atmos/test_ventcrawl.dm
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit 3e9c29258ecd78a7679d301e209290a4a958b924
Author: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Date: Mon Apr 29 20:51:19 2024 -0400
Diverse Traders (#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 <77684085+Henri215@users.noreply.github.com>
* Comments
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* 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 <77684085+Henri215@users.noreply.github.com>
* Removed trailing / in path
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed Cheap Breacher suit from inventory
* Apply suggestions from code review
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit 417d6fe8cfe35c664ed04e78726a1fb18b7fa473
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date: Mon Apr 29 20:50:35 2024 -0400
Makes kudzu much more likely to entangle you (#25167)
* lets kudzu entangle you
* Increase buckle time
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit 48db11cd8454af49e9ced4afd3352f40fbfffee4
Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Date: Tue Apr 30 03:14:26 2024 +0300
Ash Walkers now Ash Doctors (#25207)
* Ash Walkers now Ash Doctors
* Update other.dm
commit 6848ee850252a01353071eeea0027a20fe462b7a
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date: Tue Apr 30 01:12:49 2024 +0100
Updates readme, licence files (#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 <12197162+S34NW@users.noreply.github.com>
---------
Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>
commit 2e4089dc15b985ce0923cff2b68fe5cbce5f1cdd
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date: Mon Apr 29 03:07:25 2024 +0100
Various TG Chat message sorting fixes (#25229)
* Fixes unsorted emotes, announcements, votes, surgery, prayers, ahelp responses
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
commit 4add53d6c1cce3e564305607d37383deb721628d
Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Date: Mon Apr 29 05:00:34 2024 +0300
Add alternative Spear recipe for Ash walkers (#25208)
* Add alternative Spear recipe for Ash walkers
* Update recipes.dm
* Update code/modules/crafting/recipes.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/modules/crafting/recipes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
---------
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 7f37f93408a6016cf1ac4ec44caf0e37db65d3b3
Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Date: Mon Apr 29 04:33:25 2024 +0300
fix avoiding powerfist antidrop (#25274)
* fix avoiding powerfist antidrop
* Update code/game/objects/items/weapons/powerfist.dm
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
* Update code/game/objects/items/weapons/powerfist.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
---------
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
commit 83c9d8878a37aa06ab368b894f2642612ec61f9e
Author: Rayforx <154929127+Rayforx@users.noreply.github.com>
Date: Mon Apr 29 00:21:48 2024 +0200
Blood level QoL for vampires (#25075)
commit a50683ef28d4a170754a9ddab36be53a755a223c
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Sun Apr 28 18:03:14 2024 -0400
Adds the SPRK-12 Energy Pistol (#24869)
* Adds the SPRK-12 Pistol
* I Was improper and forgot to name it right
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* check it
* Update gun.dm
* less copypasta
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
* early return
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
commit fb027f73ddfe697004627a48b6dec9ab2045e849
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sun Apr 28 22:57:26 2024 +0200
Changes the `is_changeling` and `is_mindslave` procs into proper defines (#25212)
* Changes these procs into proper defines
* Henri review
commit fc7acc4597c2e69a425395f37d7cd4e24ed9ba82
Author: Burzah <116982774+Burzah@users.noreply.github.com>
Date: Sun Apr 28 13:05:39 2024 -0700
adjusted logic for humanize_spider (#25286)
commit a42bacb9fa33a805bc4c53be0f3b764274aa0664
Author: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Date: Sun Apr 28 15:53:29 2024 -0400
fifty percent off deal (#25243)
commit 057e9f16eb56606b2e3c6968fab165d89a04e05c
Author: Code-Lyoko0 <degg444@gmail.com>
Date: Sun Apr 28 14:51:34 2024 -0500
Informs Deathsquad that the bomb has been armed during Epsilon Alert. (#25242)
* informs the Death Squad that the bomb has been armed during Epsilon Alert
* Contra review, properly qdel'ing the radio on destory
commit 6fa7a48ba857c8324afb8809ec05a3191db49d2d
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Sun Apr 28 15:48:13 2024 -0400
ibheriewfofi0wnmfeionfm (#25294)
commit daa368ca10e6bd9dc175d856bcbd061cf07dce97
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Sun Apr 28 15:48:00 2024 -0400
day 1 shadow tweaks (#25290)
commit 36f7c43c9c0036a1b1ce1381ccffa5dbfb36fa54
Author: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Sun Apr 28 06:01:16 2024 +0300
Better Gas Scans (Chatbox and Colored!) (#24975)
* feat: Better Gas Analyzer AND TGUI!
https://github.com/ss220-space/Paradise/pull/2333
https://github.com/ss220-space/Paradise/pull/2461
https://github.com/ss220-space/Paradise/pull/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 1d4d95a10b4d3f8c52eb7a4aea1211dc65467693
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Sat Apr 27 21:43:58 2024 -0400
yes (#25297)
commit a3e43a3161008d1ae5ccb72ae17637703763c423
Author: warriorstar-orion <orion@snowfrost.garden>
Date: Sat Apr 27 20:06:39 2024 -0400
fix: null check during morph eat (#25291)
commit d2d932d4d15ddb3426b4b284d06f5ea1c99eb6c9
Author: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Date: Sat Apr 27 12:22:22 2024 +0100
NanoMap Auto-Update (Sat Apr 27 01:09:53 UTC 2024) (#25280)
Co-authored-by: NanoMap Generation <action@github.com>
commit 572b79bce96fa164527e74f6842c94c5f8fd9700
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sat Apr 27 10:25:17 2024 +0200
Removes num2dir (#25261)
commit dbc3bf1c8bc0981e84aa213b3ccc0518e5c92e46
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Sat Apr 27 03:23:48 2024 -0500
Removes a lot of lists (#25272)
* Removes a lot of lists
* Update code/game/turfs/simulated/floor.dm
Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com>
* Update code/game/turfs/simulated/floor/misc_floor.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com>
* Update code/game/turfs/simulated/floor/mineral_floors.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com>
* Update code/game/turfs/simulated/floor/mineral_floors.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com>
---------
Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit e810b3a9c76fb3bb42b381c4e6540efe4a14b5d9
Author: Adrer <erwin@lombok.demon.nl>
Date: Sat Apr 27 10:21:13 2024 +0200
Security level changes no longer force depowered lights on. (#25245)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
commit b1658390731745adf5cc9fb039bb0f17ad3c11a7
Author: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Date: Sat Apr 27 01:17:59 2024 +0100
Biosuit resprite (#25004)
* biosuits babeyyy
* minor changes to comments
* lil booties
* suggested change
commit e73dc13a29c34c5065462ea14653996e4ba40c68
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date: Fri Apr 26 20:00:51 2024 -0400
Improves interactions with display cases. (#25228)
* better player info for display case
* this too
* improved messaging
* finish out the docs
* Update code/game/objects/structures/displaycase.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
---------
Signed-off-by: Luc <89928798+lewcc@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: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 7a45c712b898b7c9fe7db69bd6c919b6986a0264
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sat Apr 27 00:32:00 2024 +0200
Adds a stamina meter (#24782)
* Finally done
* Contra + Qwerty review
* I don't think I broke anything :D
* Lewc review
commit 88af37bfcf564b9f433a74839ab0756dfcee780d
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Fri Apr 26 18:31:09 2024 -0400
Adds the NTSS Shadow (#24778)
* WIP
* change this
* the rest of the fucking owl
* removes QWERTODO
* let us fix the CC beacons too
* makes it look better
* makes CI work on everything but shadow, asking warriorstar
* exclude ntss shadow from window spawner checks
* final changes hopefully
* moved around parts of the shuttle
* Update code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* moves it moves it to it's own file
* move it move it
* bobby_drop_tables
* oops
* fuck
---------
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 78e782dfcbf3390ea47120b90942f78419e5bec2
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date: Fri Apr 26 23:11:08 2024 +0100
skip nanomap when no changes needed (#25182)
commit 8b0ff64cc03053f2b1ac726c15cf6fb5bffee7ad
Merge: c75279f7c8 7ab24d6519
Author: Fordoxia <fordoxia@googlemail.com>
Date: Fri Apr 26 22:42:06 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit 7ab24d6519bb4871ee8c240c6dbf7a37a9392586
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Fri Apr 26 16:50:36 2024 -0400
fixes tarot card capitalization in uplink (#25278)
commit c75279f7c8452ab02a0e41fe02d762fa7b278b07
Merge: 8c704101de 5b8ae44d03
Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Date: Fri Apr 26 16:23:32 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit 5b8ae44d032c2959e56cae07fb7230fd70e1432c
Author: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Date: Thu Apr 25 15:14:31 2024 -0400
whoops (#25268)
commit 5adf1408d151a74200ae1d9bf577c8bb5b34a9a5
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Thu Apr 25 22:04:31 2024 +0300
Bring `respawn_enabled` back to config (#25264)
commit 20701d905c2d86d11cc49b34151c5f94bcaa8e58
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Thu Apr 25 14:20:50 2024 -0400
Shades now drop bodies when killed/destroyed (#24784)
* this was a bit of a pain
* yes
* damger reviwe
* funny review
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit e204ca66947d827dade7c034fb0a05d02f471705
Author: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Date: Fri Apr 26 04:20:35 2024 +1000
pens (#25159)
commit ae7da539e3b3cc886927269a848507eabbc73f1d
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Thu Apr 25 19:20:14 2024 +0100
Fixes an SQL update file + null character save issue (#25149)
* This is what I get for sending a PR
* I DID SAY TESTING: None
commit 1377fd11667a1b49af3bf101a04780268193d2d1
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Thu Apr 25 06:00:44 2024 +0300
[s] Disguise with plant trick (#25260)
* Fix plant-disguise trick
* Resolve name collision
commit af5d187014386ee61ce11f7a63b893f5e4e66f2b
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Wed Apr 24 19:10:46 2024 -0400
Adds magic tarot cards [SERIOUS DO NOT CLOSE AFTER AFD] (#24933)
* starts it
* Update magic_tarot.dm
* MORE PROGRESS
* So many thanks to Cloudbucket, for sprites
* The Work, the Art, continues.
* more changes
* pushes the Work foward. All cards done.
* and more thanks github
* adds to BSH
* tochat
* Finishes QWERTYTODO. Magic key. World smoke
* Isaac and his mother lived alone in a small house on a hill. Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television. Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above. “Your son has become corrupted by sin. He needs to be saved.” “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life. Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins." “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world. One last time, Isaac’s mom heard the voice of God calling to her. “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you." "Yes Lord, anything!” Isaac’s mother begged. "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else." "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen. Isaac, watching through a crack in his door, trembled in fear. Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug. Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below.
* nanny bag it before I forget
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* returns early
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* RE-RE-RE-REVIEW
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
* requested changes and such
* duh
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* returns early
* Update code/datums/status_effects/buffs.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* new hrefs here to troll CI :trollface:
* Update code/game/gamemodes/wizard/magic_tarot.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
commit 69d6a8df2110f1b7d7fdec9306f3e84ed8c36aa8
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Wed Apr 24 16:21:11 2024 -0500
Overhauls player facing verb UI (#24060)
* Preference verb overhaul
* this too
* Update code/__DEFINES/preferences_defines.dm
* Update code/modules/client/preference/preferences.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* fixes + better html
* removes unused define
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
commit e615738e22d572b2d9cf2f7ece45b73991e20cc5
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date: Wed Apr 24 20:42:12 2024 +0100
All your TGUI belong to us (#25250)
commit 0c5fdaa57be0b8c2fec282f71b40a44295b3adab
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date: Wed Apr 24 15:40:45 2024 -0400
Updates contributing guide regarding signals, removes SIGNAL_HANDLER_DOES_SLEEP (#24824)
* Updates contributing guide, removes DOES_SLEEP
* Update .github/CONTRIBUTING.md
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit 3333fd051ff6e6feb70690782215d936cbaa245d
Author: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Wed Apr 24 22:38:47 2024 +0300
if you have PROCCALL rights, you can call it from VV (#25030)
commit 20a0836d1a3ba8b8b12bcd4db29d89e4b549ea21
Author: Rayforx <154929127+Rayforx@users.noreply.github.com>
Date: Wed Apr 24 07:45:43 2024 +0200
Update ghost_bar.dm (#25234)
commit c3af4456e15172057b90ae4431269a6ed8cd51d4
Author: chuga-git <98280110+chuga-git@users.noreply.github.com>
Date: Wed Apr 24 00:45:37 2024 -0500
Restricts rubbershot's guaranteed knockdown range (#25178)
* restricts rubbershot knockdown range
* actually commit the right version
* Henri review
commit a2de7f4533d36c8d2aa6697657e2cb58b2bc72f6
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Wed Apr 24 00:45:25 2024 -0500
fixes a radial menu gc false positive (#25237)
commit 6c756f98c02300a3a3d106eab89980cff6097880
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Wed Apr 24 07:45:16 2024 +0200
Makes the walls from Desecrated Duel GC properly (#24990)
* GC is a thing of all time
* Spacing
commit d233824add0b45bf2062dfe0cf9537fc2541ca1e
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Wed Apr 24 00:45:03 2024 -0500
nerfs machine overload (#25153)
commit 752deb811984b2adaca140e5a7e7c82776be2ec1
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Tue Apr 23 22:09:44 2024 +0300
Make it possible to get out of abductors experimentation machine (#24842)
* Make it possible to get out of abductors experimentation machine
* Better roll of result
* Better message of escape attempt
* Apply suggestions from code review
* Remove unnecessary check
* Slightly tweak values
commit 8c704101de2fb08d63002e49fe92ed8f4fd62ead
Merge: 339ded7dd3 67cba07b99
Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Date: Tue Apr 23 03:22:48 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit 67cba07b9975b23cd7cc48fd7ea7d503ba9df19c
Author: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com>
Date: Mon Apr 22 21:14:08 2024 -0400
Fixes Cerestation Medical Storage disposals bin, also simplifies disposals in Medbay Break Room (#24776)
* Fixes Medbay Storage disposals bin
* Life is pain
* Rogue pipe be gone
commit 853f108c89aa005e2ed1a391a54ed8fd0cb40736
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Mon Apr 22 20:50:48 2024 -0400
[SERIOUS] Improves admin tooling for radiation (#24968)
* lets clean some radiation
* changes
* lgtm
commit de6a54fbde1a0ed80e5ad4209fa2c10ef9d43c7e
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Tue Apr 23 02:49:52 2024 +0200
Removes all mentions of `return .` where they would be unnecessary (#25142)
* Removes all mentions of `return .`
* I can do this all day
* Arthri review
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
commit 6b442d3ed2ba46876c6d847d8fb87f8777325abd
Author: warriorstar-orion <orion@snowfrost.garden>
Date: Mon Apr 22 20:48:08 2024 -0400
cere: increase maint loot spawns (#25152)
commit a1ca632a191476324ff65e7d3c0e1c5ef3a4b8d1
Author: Aylong <69762909+AyIong@users.noreply.github.com>
Date: Tue Apr 23 01:37:59 2024 +0300
[TGUI] Coin Mint (#24885)
* Backend
* Simplify
* Almost ready
* Done., i think
* You can now craft a money bag
* Autodoc
* Fingerprints
* Earlier return if no money bag
* Update code/modules/mining/mint.dm
* Update code/modules/mining/mint.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update tgui.bundle.js
* Rebuild
* Fuckin hell
* Rebuild
* Update tgui.bundle.js
* Update code/modules/mining/mint.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mining/mint.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 2cfa9d620fd5f5c1aeb9e2ab39d1473369ff1169
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Tue Apr 23 01:04:38 2024 +0300
Fixes exploit (#25101)
commit 7fa44a31fb522fcb62ae4d5f4cca8707f1d99cf9
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Tue Apr 23 00:32:49 2024 +0300
Full Auto Gun Mode Component (#24998)
* Full Auto Gun Mode Component
* Apply some refactoring
* spaces mhmm
* Some signal movement
* Apply DGamerL suggestions
* Unknown SIGNAL_HANDLER no more
* Fix runtime if uid is passed
* Why the hell you even care
* god you serious
---------
Co-authored-by: Gottfrei <zweisen@gmail.com>
commit 00be61a8116ad3dbc550853870cd8228977deccf
Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Mon Apr 22 23:53:14 2024 +0300
Better round start time handling after using delay (#25035)
commit 2d1d7e283b0fd5617945c933e84f448ec3f49ced
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Mon Apr 22 15:46:21 2024 -0500
makes some uis no longer automatically update (#25121)
* makes some uis no longer automatically update
* fixes cloning sporadically not working
* Revert "fixes cloning sporadically not working"
This reverts commit 2d88887cf632cebf6993a9bea0bb2df64ec763d0.
* Update code/modules/hydroponics/seed_extractor.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/modules/hydroponics/seed_extractor.dm
* Update code/modules/hydroponics/seed_extractor.dm
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit 80438de31641d0079cfc66c89e7eeafbaaad3222
Author: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Mon Apr 22 23:46:20 2024 +0300
Remove automatedannouncer mob (#24727)
* remove automated announcer mob
* remove list(z) from autosay
* typo
* remove more of unused role args
* missed passing a value...
* move comment
* better check
* better check
* comment for say_understands
* Update code/modules/mob/living/brain/living_brain.dm
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
---------
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
commit 8b6fec06221500472daab165c42911b81affb341
Author: Charlie Nolan <funnyman3595@gmail.com>
Date: Mon Apr 22 13:38:01 2024 -0700
Prevent duplicate messages when sending a PM to yourself. (#25124)
* Prevent duplicate messages when replying to yourself.
* Oops.
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
commit 58c61475e650f0a2e147d256e7df800d65e92f7e
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Mon Apr 22 15:37:16 2024 -0500
fixes repair borg not working in some cases (#25151)
commit 3449f5175dc21fa5b34a60c3067a5e8c7fbfa76c
Author: warriorstar-orion <orion@snowfrost.garden>
Date: Mon Apr 22 16:33:14 2024 -0400
ci: add maplints/fix matching stacked disposals/pipes (#25120)
commit 831776b40dc6505cc2cf740f5fa63ef0634629a0
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Mon Apr 22 15:33:07 2024 -0500
fixes some action button issues (#25140)
* fixes some action button issues
* murder
* thanks autocopy
* morph and xenos
* Update code/datums/action.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 71bc06cd4eed17607a910854b0d697c8d44a770d
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Mon Apr 22 22:32:58 2024 +0200
Halves the damage dealt by PKAs to blobs (#25154)
* Makes PKAs deal half damage to blobs
* Update code/modules/events/blob/theblob.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
commit 15483d1b88885e807ffc538f3e0cab2484505c08
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date: Mon Apr 22 21:32:52 2024 +0100
Add modern equivalents of legacy IE-only CSS rules/properties (#25205)
* alternatives to legacy -ms stuff from TGUI
* tgui build
* bundle
* rebuild
---------
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
commit fdea9d76692f7f384a9b5dc09dd50fcce8c55fb5
Author: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Date: Mon Apr 22 23:08:45 2024 +1000
Update cerestation.dmm (#25190)
commit 5fe22f485c028615f76f9acbf666daa15ecabadf
Author: chuga-git <98280110+chuga-git@users.noreply.github.com>
Date: Mon Apr 22 08:00:03 2024 -0500
permits mobs with chunky fingers to fire blowgun (#25176)
commit 4b0f774cdc5f0f8472081fb60b94ba6995e57843
Author: Code-Lyoko0 <degg444@gmail.com>
Date: Mon Apr 22 05:29:06 2024 -0500
make the station not go into delta alert when the Death Squad arms the nuke (#25163)
commit 339ded7dd3745f78584cf4d16eb805479335b4a7
Merge: 8481f50f90 f12f75c652
Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Date: Mon Apr 22 01:52:33 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit f12f75c65284b86779086fbeba2a6778a23d8bb9
Author: Charlie Nolan <funnyman3595@gmail.com>
Date: Sun Apr 21 16:47:32 2024 -0700
Update CONTRIBUTING.md (#25235)
commit 6d3549c3ca35eb4dcecabb35968af1d4d81a9d35
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Mon Apr 22 01:34:33 2024 +0200
LOOK IT'S COCAINE BEAR (1985) (#25086)
commit ebbbf62cecb3deaba0ae9e484d2b5874a2cde604
Author: tristan1333 <ttb09RD@gmail.com>
Date: Mon Apr 22 09:06:47 2024 +1000
Chicken meat/burger, Onigiri, Seaweed, updated boiled rice sprite (#24813)
* Adds chicken meat, burger, onigiri, updates boiled rice sprite
* Update code/modules/food_and_drinks/food/foods/side_dishes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/objects/items/stacks/seaweed.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* changed chickenburger pathname, deleted old boiled rice sprite
* Transfers reagents from rice to onigiri
* Update code/modules/research/designs/biogenerator_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* All sushi now requires seaweed
* new seaweed desc, attackverb oopsy daisy, seaweed attack_self doesn't show pointless list, Onigiri goes in hand
* moved seaweed sprite to organic.dmi
* Update code/modules/research/designs/biogenerator_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update organic.dmi
* re
* goal
* oops
* early return
* Update code/modules/food_and_drinks/food/foods/side_dishes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/food_and_drinks/food/foods/side_dishes.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/modules/food_and_drinks/food/foods/side_dishes.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/modules/food_and_drinks/food/foods/side_dishes.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
commit 224c488c40191e4f30db7102350f14d5ac5bdec6
Author: Burzah <116982774+Burzah@users.noreply.github.com>
Date: Sun Apr 21 15:54:06 2024 -0700
CA Gang (#25233)
commit 0a38123ff8bf5e40da19e86090e088d6cc830a66
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Mon Apr 22 00:39:59 2024 +0200
Adds me to `CONTRIBUTING.md` (#25232)
* I WILL conflict burza and funny
* Okaaaaaaaay fiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiine
commit 8481f50f9015a6c0b91b36ad18b16b5c6e6e0219
Merge: 5b793c36ed 4f8d91a316
Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Date: Sun Apr 21 21:54:14 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit 4f8d91a316a915d3ab627b02f731a3ccd6beb718
Author: Charlie Nolan <funnyman3595@gmail.com>
Date: Sun Apr 21 12:45:47 2024 -0700
oops (#25210)
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
commit 9e6dcf9c46d6e9d1d476f814a0e8f43b0d11a437
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Sun Apr 21 13:26:35 2024 -0500
removes the remaining datum redeclares (#25220)
* removes the remaining datum redeclares
* the two fixes
* finneee contra
* OK CONTRA
* readd
* CURSED TO BE BROWN!
* facking automerge
commit f83ef617e97107c02d778bebdbbd28df02b9b07e
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date: Sun Apr 21 11:59:23 2024 -0400
Expands "genderless" to all species, adds body-type option, removes some gender checks (#23910)
* adds most body type support, removes some gender checks
* remove gender from species, accessories
* restore pick_list
* re-adds limitations on accessories
* Universal access to body hair
* remove unused var
* Update example config, some preference saving code
* updates tgui bundle
* oops
* Remove formatting
* hopefully undoes formatting changes
* dammit
* been meaning to fix this one for a while
* dgamer reviews
* move body_type into human_defines
* sql file changes
* update tgui
* Update db code
* bump versions
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
commit 9bc9b4b67ac460816db834e81a2d335eff6003e8
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sun Apr 21 17:24:50 2024 +0200
Removes duplicate definitions of `/datum/gamemode` on almost every gamemode file (#25219)
* Why did every gamemode do this :(
* Contra request
commit 585a885b1f5c667f6e2a4da55571c7cde833a338
Author: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sun Apr 21 16:53:25 2024 +0200
Easy fix (#25216)
commit f6196809f2c6367ea41e34a7864b7a09292fd590
Author: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Date: Sat Apr 20 10:08:45 2024 +0100
NanoMap Auto-Update (Sat Apr 20 01:09:53 UTC 2024) (#25211)
Co-authored-by: NanoMap Generation <action@github.com>
* Revert "Squashed commit of the following:"
This reverts commit baaf5dd7b82e82c2ac4e6c80a82f5d7426a2b723.
* Update code/game/objects/items/crayons.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
* stuff
* Update cardborg.dmi
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
* refactor extended descriptions
* Squashed commit of the following:
commit b819961a52ccaf982026744cb6617b1a485181a8
Merge: e5e4941732 67a8a340e6
Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Date: Sat May 25 14:55:18 2024 +0100
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise
commit 67a8a340e6468efd775e20166825fa328317c584
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Sat May 25 02:43:32 2024 +0100
Fix admin PMs not working from discord (#25604)
commit 2e01f3591d248917e92284038aab68449884e1ff
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Fri May 24 21:42:15 2024 -0400
makes revenants not runtime clicking nearly anything (#25601)
* makes revenants not runtime clicking nearly anything
* Update code/_onclick/observer_onclick.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+C…- Loading branch information
7 people
committed
May 30, 2024
1 parent
3e23608
commit 8940351