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

76 Commits

Author SHA1 Message Date
Silverplate 024af9c248 Removes tech levels from high risk items (#26725) 2024-09-16 03:28:49 +00:00
CRUNCH 7e09585464 Gives Most High-Risk Items Extended Descriptions (#25630) 
* LORE!

* MORE LORE!

* Update code/modules/hydroponics/gene_modder.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update krav_maga.dm

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update nuclearbomb.dm

* Apply suggestions from code review

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* NAD

* Update teleportation.dm

* Update armor_suits.dm

* Fixing some minor typos for cyborg upgrade flavour text

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

* Briefcase Full of Cash buff

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

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Apply suggestions from code review

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

* Update documents.dm

* Update magboots.dm

* very minor edits.

* Apply suggestions from code review

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

* update

* Update armor_suits.dm

* Apply suggestions from code review

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

* format

* Update code/modules/hydroponics/gene_modder.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update defib.dm

* Update armor_suits.dm

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@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: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-04 08:05:38 +00:00
DGamerL bad8b31afa Changes all .len to length() where applicable (#25174) 
* Globals work

* Double access works

* All other things

* Revert "All other things"

This reverts commit 6574442eb6.

* More changes that compile and work

* IT WORKS AAAAAA

* Changes even more .len to length()

* Apply suggestions from code review

* Update code/datums/mind.dm

* Update code/__HELPERS/sorts/InsertSort.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

* Update code/__HELPERS/sanitize_values.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
 2024-04-19 17:32:09 +00:00
DGamerL 382a71df0d Renames all typepaths + names of implants to biochips (#23172) 
* The fix

* Contraaaaaa

* Fixes CI

* Fixes the pads + cases

* Uplink datums

* Update code/datums/mind.dm

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

* Update code/__HELPERS/unsorted.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/surgery/implant_removal.dm

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

* Outfits now use a proper variable name

* Fixes surgery (oops)

* More .dme changes

* Renames the folder

* Fixes bad merge

* Contra review

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

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

* Fixes CI fail

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-06 23:15:55 +00:00
Aylong 825c2c8866 Converts Input List to TGUI Input Lists (#23396) 
* Part 1

* Testing 1

* Revert "Testing 1"

This reverts commit fc06554b28.

* Part 1.1

* Part 2 - UI Style List

* Preferences lists

* Preferences lists - DONE

* More inputs

* MOOOOOORE

* UI style else

* Last ones

* Double name fix

* Pre-selected Search

* Return Pick Darkness

* Return Pick Darkness

* Missing users

* Some review changes

* Revert MULE lists

* I just hate MERGE CONFLICT label

* List window tweaks

* I think there it is

* why i am stopid

* Update tgui.bundle.js
 2023-12-10 19:38:23 +00:00
GDN 35754c77ea Verb cleanup (#22224) 
* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go
 2023-11-12 20:19:17 +00:00
HMBGERDO 62a2c82eab Hand tele tweaks (#21224) 
* hand tele tweaks

* i need to sleep

* updated portal description, removed hand tele ability to remove portals

* added disabled icon state, removed dual portals

* syndi teleporter stages + icons

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

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

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

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

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

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

* resolving conflict

* no more races

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-07-07 13:57:56 +01:00
DGamerL 173bfb92f5 Removes bio resist from the code (#21108) 
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
 2023-06-03 09:50:22 +01:00
Henri215 dc75a748f1 Fixing common spelling mistakes part 3 (#20870) 
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
 2023-04-22 09:44:27 +02:00
GDN 626d2754d5 objective items being destroyed are now logged (#20485) 
* objective items being destroyed is now logged

* signal time

* oop

* Update code/modules/projectiles/guns/energy/laser.dm

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

* Update code/game/objects/items/documents.dm

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

* mira review

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-03-08 20:15:16 +01:00
warriorstar-orion 066bd06e8d Whitespace cleanup part 3. (#19897) 
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
 2022-12-27 11:00:39 -05:00
Sirryan2002 520b0914ab [TGUI] Implant Pad + Implanter Related Sprites + Slight Implant refactor (#18556) 
* holy guacamole

* TGUI capitilization

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

* TGUI rebuild

* implements requested changes

* fixes

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* fulfilling more requests

* uplink fixes

* init order stuff

* charlies requested changes

* Apply suggestions from code review

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2022-09-03 00:33:58 -05:00
KalevTait 6a91840962 Code Readability - Weapons (#18171) 
* weapons

* weapons

* prefer explicit time

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Don't have code on same line as control statement

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-07-10 13:59:33 +01:00
Charlie 5e7ec8ea7f Fixes some portal logging. (#17655) 
* fix

* pass the user

* named arg

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-04-24 15:08:08 +01:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
Fox McCloud c8a7607129 Purges a Bunch of In World Calls (#13641) 
* Purges a Bunch of In World Calls

* tweaks and fixes also typeless lists

* typeless

* fixes

* tweak
 2020-06-22 06:56:19 -06:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
moxian 1d0b84addb Fix prisoner implant z-level checking. 
- Can no longer hide in a locker from prisoner computer tracking
- locator no longer tracks implanted people across z-levels
 2019-11-09 10:17:41 +00:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Kyep 1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Kyep 45a88d4f3f split teleportation changes out into another PR 2018-08-02 09:36:10 -07:00
Kyep ce4775c6af z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas 2018-08-02 09:03:17 -07:00
Kyep c3ed490159 Fox 4 2018-07-07 16:15:26 -07:00
Kyep 08fdc2bce3 merge conflict fix 2018-04-25 23:48:44 -07:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Kyep 1b6b1deecc fixes merge conflict in custom_grenades.dm 2018-04-01 18:59:25 -07:00
uraniummeltdown 946ae0d58d moves var/list/armor to /obj level 
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
 2018-03-04 13:52:54 +05:00
Kyep 83192c3678 peaceful mode, loot rework, hand tele respect areas, AI 2018-01-07 01:12:12 -08:00
Aurorablade 70b1a0c826 bugfix 2017-06-30 03:16:12 -04:00
Crazylemon64 72841c9e70 Refactors TK to work a bit more consistently 
Also allows remote stack manipulation shenanigans
 2017-06-22 23:24:37 -07:00
tigercat2000 633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Krausus 92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Crazylemon64 bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64 ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
monster860 009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Fox-McCloud 8c229280d2 consistency helps 2016-01-16 04:44:56 -05:00
Fox-McCloud ea11eaa387 Ports Wormhole Projector 2015-12-19 00:57:40 -05:00
Tastyfish 280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Markolie b770e8f2a0 Implant fixes/updates 2015-09-23 02:51:33 +02:00
Fox-McCloud a019934e9e Pass I 2015-09-04 05:18:48 -04:00
ZomgPonies 91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
DZD 4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00