cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-12 18:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,953 Commits 27 Branches 2 Tags
2c2dc377fe6d682fe1a2bcda4d0887b153bf8ecc
Commit Graph

27122 Commits

Author SHA1 Message Date
Сиротка
d05970e300 Botany light sourses can now be turned off (#25315) 2024-05-10 19:37:29 +00:00
Luc
d25ba20e32 Moves pre-round observers to the wizden (#25330) 
* let's see if people like this

* Update code/game/objects/effects/landmarks.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/effects/landmarks.dm

Co-authored-by: GDN <96800819+GDNgit@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: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-05-10 19:35:58 +00:00
GDN
110f775d8e fixes some locate checks being in world (#25365) 2024-05-10 13:57:30 +00:00
Social-Moth
f28b525e62 Adds a bone tumor specific to slime people (#25320) 
* Adds flavor to slime people bone tumors

* Adds slime tumor, a type of bone tumor

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Social-Moth <117739059+Social-Moth@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Social-Moth <117739059+Social-Moth@users.noreply.github.com>

* Update code/modules/surgery/organs/bone_tumor.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Social-Moth <117739059+Social-Moth@users.noreply.github.com>

* Update code/modules/surgery/organs/bone_tumor.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Social-Moth <117739059+Social-Moth@users.noreply.github.com>

* Update code/modules/surgery/organs/bone_tumor.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Social-Moth <117739059+Social-Moth@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Social-Moth <117739059+Social-Moth@users.noreply.github.com>

---------

Signed-off-by: Social-Moth <117739059+Social-Moth@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-05-10 13:36:24 +00:00
SPACEGEESE
6a71593294 removes clingspiders from gold core spawns (#25355) 2024-05-09 23:22:18 +00:00
chuga-git
771a6e7424 Fixes vampires ending up with negative blood (#25368) 
* high powered clamping action

* i have no idea what i'm doing
 2024-05-07 23:58:20 +00:00
Taurtura
014b182d5a Magmawings, Icewings and Ancient Goliaths are now (almost) guaranteed to drop their kinetic crusher trophies if you kill them using one. (#25343) 
* ancient goliath trophy droprate update

* icewing + magmawing trophies droprate tweak
 2024-05-07 02:34:50 +00:00
Probablyjay19
a45fc0bbdb Removes toddler dolls because it's just a bad idea (#25288) 
* Removes toddlers because it's just a bad idea

* puts some text back that wasn't actually for toddlers

* removed the baby
 2024-05-07 02:34:40 +00:00
MengisLordis
f27f8fa7a9 Fixed some event things (#25403) 2024-05-07 00:11:47 +00:00
DGamerL
8f870e960a Removes blobs from the ticker if the core is destroyed, truncates tally text (#25156) 
* Removes blobs from the ticker if the core is destroyed, truncates counter

* Removes the mind instead of the camera mob

---------

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2024-05-06 19:51:28 +00:00
DGamerL
b04bdf4ff9 Adds bullet impact particle effects! (#25177) 
* Initial commit

* Cleaning up + more debris

* Adds missing trailing newline

* CI doesn't like these and starts an infinite loop it seems

* Hacky solution? I call it fixing CI

* Final fixes
 2024-05-06 19:44:14 +00:00
matttheficus
a43944fc39 Splits Up Chameleon Kit (#25238) 
* cham gear tweaks

* non-cham mask

* Henri Review

* henri review 2: electric boogaloo
 2024-05-06 19:30:50 +00:00
CRUNCH
8113b6963e Renames Kabobs to Kebabs. Fixes Kebab-Related Issues. Expands Kebab Production Methods. (#25230) 
* 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

* Kebab

* Update code/modules/food_and_drinks/recipes/recipes_grill.dm

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

* Update recipes_grill.dm

* Update recipes_grill.dm

* Update code/modules/food_and_drinks/food/foods/ethnic.dm

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

* Update code/modules/food_and_drinks/food/foods/ethnic.dm

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

* Update code/modules/food_and_drinks/food/foods/ethnic.dm

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

* Update code/modules/food_and_drinks/food/foods/ethnic.dm

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

* Update code/modules/food_and_drinks/recipes/recipes_grill.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-05-06 19:29:49 +00:00
Contrabang
0ace3d4351 Adds CI to remove duplicate definitions (#25218) 
* the purge

* yes

* incorrect comment

* send it
 2024-05-06 19:29:19 +00:00
Charlie Nolan
11ec0e306f Update Secondary Goals to accept reagents in fermenting barrels. (#25172) 
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
 2024-05-06 19:28:22 +00:00
Charlie Nolan
a5d780e4d7 Don't html-ize high rank admins in Discord. (#25117) 
* More escaping fixes.

* Update code/__HELPERS/text.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* 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: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-05-06 03:19:14 +00:00
BiancaWilkson
eb50355daf fixes a path (#25382) 2024-05-06 03:14:50 +00:00
Qwertytoforty
1150bdb265 fixes hecksuit (#25389) 2024-05-06 03:14:23 +00:00
HMBGERDO
9f7d4a128e fixing detaining mode (#25334) 2024-05-05 18:38:54 +00:00
Charlie Nolan
4949f0b71e Admin secondary goals will now unregister when deleted/completed. (#25171) 
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
 2024-05-05 18:32:29 +00:00
Qwertytoforty
274ff7b1c4 fixes sleepblind not being cleared if you are blind from othermeans (#25390) 2024-05-05 15:03:06 +00:00
Qwertytoforty
9ae66dd496 You can no longer see hud / screen when asleep. DOESN'T AFFECT BLINDNESS (#24360) 
* You can no longer see hud / screen when asleep

* oh fuck the huds

* Update code/_onclick/hud/robot_hud.dm

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

* storing when looking into a bug

* more tweaks

* Initial screen object fixes

* fix for old screen types

* animation my dear watson

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-05-05 09:42:12 +00:00
warriorstar-orion
526aea1e10 Add "docking area signaller", a device for creating new white ship docks (#24659) 
* Add "docking area signaller", a device for creating new white ship docking ports.

* fuck it

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* add span classes for to_chat

* fix plural check

---------

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-05-04 22:23:54 +00:00
Arthri
4e036c77e3 /tg/ui Virology PanD.E.M.I.C 2200 (PanDEMIC) (#24533) 
* /tg/ui PanDEMIC

* Fix types on booleans

* [ci skip]

* Fix oversights

[ci skip]

* Fix styling

* Apply suggestions from code review

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>

* Remove unused field

* Optimize ui_data

* Make clone cooldown spin

* Change unit

[ci skip]

* Remove use of !!

* Fix Flex style prop accidental override

* Rewrite Stack to Flex

* Revert changes to Stack

* [ci skip]

* Build and update tgui

* Move force update code

* Build and update tgui

* trigger ci

* Fix style

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-05-04 22:10:53 +00:00
Qwertytoforty
38d16c4698 fixes bottler trying to produce a reagent that does not exist (#25374) 2024-05-04 18:42:40 +00:00
Burzah
00ec4ba7e2 Adds an admin message and logging for 'Crew Traitor' smite (#25323) 
* adds an admin message for crew traitor smite

* adds additional admin logging for smite
 2024-05-03 23:57:10 +00:00
Adrer
67cab8220a Fixes being unable to move objects out of your way when stuck. (#25358) 
* You can once again move a pulled object out of the way

* Updated comment

* Comment split

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-05-03 23:20:55 +00:00
Сиротка
166dd00290 Vetus Speculator now tell you what type he is (#25316) 
* Vetus Speculator now tell you what type he is

* Update ancient_robot.dm

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

Co-authored-by: Sheep <46016730+Scribble-Sheep@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: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
 2024-05-03 23:19:14 +00:00
DGamerL
1263868238 Fixes a very old singularity bug (#25356) 2024-05-03 19:41:17 +00:00
CRUNCH
3126eaf97c Makes the Supermatter Announcements More Noticeable. (#25191) 
* The SM is LOUD!

* Whoops.

* Hallucination

* Update code/modules/power/engines/supermatter/supermatter.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-05-03 16:58:36 +00:00
CRUNCH
654a48ab86 Xenoborg flash no longer disappears when burning out. Removes nonfunctional spray. Alters some descriptions for xenoborg items. (#25281) 
* Alters some xenoborg stuff

* oops

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

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

* removes commented code

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-05-03 14:41:34 +00:00
DGamerL
5040dc286e Makes mentor PMs show up as mentor PMs again (#25351) 2024-05-02 23:49:04 +00:00
Contrabang
fe59ff5c3d adds more hand keybinds (#25225) 2024-05-02 23:33:24 +00:00
CRUNCH
073ad533fa 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>
 2024-05-02 17:38:45 +00:00
Henri215
2144a93627 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>
 2024-05-02 11:52:00 +00:00
Christasmurf
d587effe2c 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>
 2024-05-02 11:37:44 +00:00
Divulf
15e7fcdb3f 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>
 2024-05-02 09:59:35 +00:00
Mikhail Dzianishchyts
ba4994d889 Tweak recipes of glasses (#25070) 
* Tweak recipes of glasses

* Allow some sunglasses as ingredient

* Revert time of recipes
 2024-05-02 00:35:39 +00:00
Mikhail Dzianishchyts
5ca09c7fe7 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>
 2024-05-02 00:27:10 +00:00
Adrer
24726c60fe 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>
 2024-05-02 00:20:07 +00:00
Mikhail Dzianishchyts
45b0f34d95 Don't check side pressure if filter isn't.. filtering (#25019) 2024-05-02 00:06:23 +00:00
Charlie Nolan
50a986b8de 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>
 2024-05-02 00:04:50 +00:00
CRUNCH
e19559ad54 The Gibber Now Drops 6 Meat Instead of 3 When Gibbing. (#25287) 
* Update gibber.dm

* extra
 2024-05-02 00:01:24 +00:00
CRUNCH
1feb21eed1 [FIX] Cyborgs With Guns Can Now Perform Executions (With Guns!). (#25275) 
* borg execution time

* Update gun.dm

* Update gun.dm

* Update gun.dm
 2024-05-01 23:58:35 +00:00
Burzah
f8ebba6ed1 Adds logging for thrall deconversions (#25305) 
* thrall deconversion logging inside water.dm

* moves logging to vamp_thrall.dm instead
 2024-05-01 23:49:05 +00:00
Qwertytoforty
f0209d975b 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
 2024-05-01 23:46:42 +00:00
DGamerL
96aa08823c Adds it (#25254) 2024-05-01 23:23:31 +00:00
Arthri
af7f35a0fe 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>
 2024-05-01 23:23:26 +00:00
Qwertytoforty
a3a1be49b0 modsuits have the same virus protection as space suits / biosuits (#25310) 2024-05-01 23:23:19 +00:00
Qwertytoforty
daf76d3aaa gives lavaland plants 50 potency (#25322) 2024-05-01 23:23:09 +00:00