cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,401 Commits 26 Branches 2 Tags
521abceae83be85905923cb7253c8eb85a3d6bb7
Commit Graph

26811 Commits

Author SHA1 Message Date
Charlie Nolan
521abceae8 Made effect teleporting into a trait. (#24640) 2024-03-16 04:40:27 +00:00
JimKil3
aa740508e2 Fixes assistants spawning with fake wizard gear (#24631) 
* yea

* spacing
 2024-03-15 20:18:04 +00:00
Charlie Nolan
11b808cc0d Removed an unused bit of UI data from the supply console. (#24630) 2024-03-15 19:42:24 +00:00
dj-34
835325720c Reduce the move delay buffer to 1 tick (#24615) 
* Reduce the move delay buffer to 1 tick

* Fix linter
 2024-03-15 08:07:39 +00:00
Aylong
59af3354b5 FontAwesome 6.5.1 (#24585) 2024-03-14 20:58:33 +00:00
DGamerL
c4412be390 Makes borgs require to refill their metal, glass and reinforced glass manually instead of automatically from a cyborg recharger (#23944) 
* Makes some borg sheet types require manual refilling

* Oopsie

* Fixes ORM deductions + Reverts changes for drones

* Contra review

* Fixes module logic

* Update code/modules/mining/machine_redemption.dm

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

* Update code/modules/mining/machine_redemption.dm

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

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

* Farie review

* Update code/modules/mining/machine_redemption.dm

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

* Update code/modules/mining/machine_redemption.dm

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

* Farie review

* I am an idiot

* Fixes a comment

* Update code/modules/mining/machine_redemption.dm

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

* Farie Review

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2024-03-14 18:46:30 +00:00
BiancaWilkson
77837fb892 Infinity (#24527) 2024-03-14 18:44:08 +00:00
Mikhail Dzianishchyts
557f6ca0b1 Add cargo bay and supply shuttle accesses to identification computer (#24536) 2024-03-14 18:42:45 +00:00
cybercapitalism
a0bbeef2df Sharp attacks no longer get randomly blunted when the target is dead (#24552) 
* extra blunt check no longer happens if target is dead

* un-inverts bloody check

* Ebba review
 2024-03-14 18:41:53 +00:00
Contrabang
694959178b Changes implicit nulls to be explicit (#24587) 
* , , -> null

* more

* bam

* lets undo these, for atomicity

* NOW THIS IS MORE

* lol

* oops
 2024-03-14 18:38:32 +00:00
PopGamer46
729dc56965 Fixes the nanobank tgui input window not being able to accept pin codes above 10000 (#24576) 
* make max_value actually fit pin code

* iam officially blind

* fixes the same issue with setting the money account on a agent id
 2024-03-14 18:37:31 +00:00
JustAnUSB
cf65c1a8e8 lizard fixing gravgen (#24606) 2024-03-13 16:52:06 +00:00
Contrabang
073852c664 Adds more unit tests for improper cables (#24262) 
* cablening + remove a duplicate proc

* okay compile im dumb

* oops

* okay im dumber than I thought

* lmao

* OKAY IT WORKS PROPERLY NOW

* lets test these maps to see if they pass

* maybe this works

* undo the testing

* unfuck map files

* unfuck shit maybe?

* PLEASE i think fucking merge hooks are fucking me

* okay goodbye merge hooks

* PLEASE
 2024-03-12 13:33:26 +00:00
DGamerL
939532d948 Makes Geraniums and Lilies not subtypes of Poppies (#24271) 
* Easy peasy

* Fucking Delta

* Fixes stealth conflict

* Fixes it for real

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-12 13:00:34 +00:00
Henri215
1c41bbd4be Resprites brown and white fedora (#24334) 
* Resprites brown and white fedora

* Update code/modules/clothing/head/misc_hats.dm

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

* Update code/modules/clothing/head/misc_hats.dm

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-03-12 11:42:13 +00:00
CRUNCH
91be8af21b Renames "Cyborg Analyzer" to "Machine Analyzer", it now scans how damaged machines are too! (#24063) 
* 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

* Machine Analyzer

Renamed "cyborg analyzer" to "machine analyzer".

It now scans machines too.

* Refactor

Everything is now in scanners.dm yaaaay!

* Update code/game/objects/items/devices/scanners.dm

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

* Update code/game/objects/items/devices/scanners.dm

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

* Update code/game/objects/items/devices/scanners.dm

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

* Helper proc woooo

* Update code/game/objects/items/devices/scanners.dm

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

* Update code/game/objects/items/devices/scanners.dm

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

* renaming stuff

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

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

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

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

* Update scanners.dm

* Update scanners.dm

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-12 11:15:28 +00:00
Charlie Nolan
8c531f4a49 Let MMI brains commit suicide. (#24411) 
* Let MMI brains commit suicide.

* Update code/game/verbs/suicide.dm

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

* Update code/game/verbs/suicide.dm

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-03-11 15:50:45 -04:00
Contrabang
ae202e22b5 GOODBYE TECHDEBT (#24408) 2024-03-11 15:09:44 -04:00
GDN
5367656862 storage items no longer bring up the turf panel on alt-click (#24395) 
* storage items no longer bring up the turf panel on alt-click

* these too
 2024-03-11 15:08:02 -04:00
Christasmurf
03f66b19cc Quartermaster Drip (#24341) 
* quartermasterdrip

* Update code/modules/clothing/head/job_hats.dm

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

* Apply suggestions from code review

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-11 15:05:27 -04:00
Henri215
5bfd9186e2 Adds five new borg skins! (#24287) 
* New cyborg skins

* The other 4 sprites

* fixing duplicate
 2024-03-11 15:03:32 -04:00
Adrer
1ed34d9804 [FIX] Borg hat fixes (#24547) 
* Borg hats fixes

* Update code/modules/mob/living/silicon/silicon_defense.dm

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

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-03-11 14:58:52 -04:00
Code-Lyoko0
60de9f9b8f Makes it clear that central command has called the shuttle when cance… (#24355) 
* makes it clear that central command has called the shuttle when cancel shuttle is used from the admin panel.

* DGamerL review

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

* Furrior review

Co-authored-by: Mikhail G. <furiorg@gmail.com>

* Furrior review part 2

* changeed all mentions of cancel(null, TRUE) to cancel(byCC = TRUE)

* missed one

---------

Co-authored-by: Code-Lyoko0 <113879982+Code-Lyoko0@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Mikhail G. <furiorg@gmail.com>
 2024-03-11 14:28:57 -04:00
Contrabang
3557748229 People are now hidden behind smoke (#24229) 
* no, that is NOT solid snake

* lol

* more names

* Update code/game/objects/items/weapons/storage/boxes.dm

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

* Apply suggestions from code review

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

* Update code/game/objects/items/weapons/storage/belt.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-03-11 14:13:59 -04:00
Contrabang
e32544e599 #undef is now required for all file defines (#24091) 
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
 2024-03-11 14:03:30 -04:00
Marm
47f3b87a9f Makes Genetics less miserable + Removes mentions of midget from code. (#24114) 
* its been like this for how long?

* woops wrong pr

* i hate random chance

* steel change

* Update code/game/dna/mutations/_mutations.dm

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

* Update code/game/dna/mutations/_mutations.dm

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

* Works

* woops space indentation

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-11 13:55:01 -04:00
Charlie Nolan
6bffc00a2e Locked down research servers. (#24415) 2024-03-11 13:12:38 -04:00
Luc
2ee1b06936 Purchasable Emergency Shuttles (Ready for review) (#23701) 
* basic framework

* Moves shuttle loading out to subsystem

* work out most of the ordering logic

* better whitelisting

* shuttle speed factor is a thing now

* Better speed factor, renaming

* try to fix some typing issues

* Apply suggestions from code review

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

* Fixes some issues with multiple shuttle orders

* add some basic prices

* more minor price adjustments

* Add cmag support

* order of ops

* Update code/controllers/subsystem/SSshuttles.dm

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

* Make necessary tgui tweaks

* Whitespace suggestions

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

* Update code/controllers/subsystem/SSshuttles.dm

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

* addresses some review concerns

* remove todo

* Apply suggestions from code review

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

* Update code/controllers/subsystem/SSshuttles.dm

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

* ahh eto

* cleaned up as per discord

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-11 17:12:06 +00:00
Charlie Nolan
c390cc9ee1 Custom food can now be renamed, as the tip indicates. (#24402) 
* Custom food can now be renamed, as the tip indicates.

* Descriptive variable names are good.
 2024-03-11 13:05:46 -04:00
1080pCat
b897966381 Janitors(and jani ert) dont miss disposal shots anymore (#24164) 
* beats me, saving for later

* working now

* desc

* saw whitespace as i hit commit :(

* guh

* DGL review

* forgor

* Update code/__HELPERS/trait_helpers.dm

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

* uhh

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-11 12:59:31 -04:00
warriorstar-orion
a8537dba85 Improve polymorph randomness; add more potential transformations, including non-reproducing terrors. (#24206) 
* Improve staff/wand of change random distribution.

* It's length() not .len

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

* use 'as anything'

* add terrors to potential picks

* slightly better wording

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-11 12:52:37 -04:00
larentoun
c5c911d252 [DOWNSTREAM] Cyrillic Support v2 (#24075) 
* cyrillic fixes cbdad6f11f

* fix: remove control characters

* utf-8 support

* more fixes

* spellbook to utf8

* Update code/modules/research/server.dm

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

* Update code/modules/research/server.dm

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

* Update code/modules/paperwork/paper.dm

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

* Update code/modules/paperwork/folders.dm

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

* Update code/modules/mob/mob_say_base.dm

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

* update formatting

* fix ai alerts

* fix spaceheater

* fix noticeboard

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-03-11 09:35:08 +00:00
Adrer
590aab6c5e Allows you to set a jetpacks stabilizer setting again (#24542) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-03-10 20:23:43 +00:00
Mikhail Dzianishchyts
6e9ac75074 Machinery changes (#24518) 2024-03-10 20:22:00 +00:00
Charlie Nolan
d5461d38c8 Improved storage UX of labcoats and similar. (#24404) 
* Improved storage UX of labcoats and similar.

* Don't runtime when forceMove is called during initializtion.

* Update code/modules/clothing/suits/suit_storage.dm

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

* Update code/modules/clothing/suits/suit_storage.dm

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

* Update code/modules/clothing/suits/suit_storage.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-03-10 20:20:09 +00:00
Charlie Nolan
80a1fe9101 SMESes now connect when built, and report if they're connected. (#24354) 2024-03-10 20:15:03 +00:00
Henri215
e9cd4825a4 Mapped in cryo cells now gives the correct amount of cables when deconstructed (#24278) 
* cryo cell fix

* formatting
 2024-03-10 20:07:17 +00:00
GDN
ace4b61403 Fixes local repos with an edited DME not always being able to compile (#24544) 2024-03-10 20:05:12 +00:00
AffectedArc07
b2bc46c810 New webmap URLs (#24522) 2024-03-10 18:22:40 +00:00
Kano
d73f7f3361 fixes SM crystals being able to delete containment fields (#24503) 
* adds a check for containtment field

* Aylong's review

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

---------

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
 2024-03-10 18:22:28 +00:00
Marm
31ddb3dd18 crate (#24498) 2024-03-10 18:22:02 +00:00
Adrer
56295fdc6d No longer removes traits (#24499) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-03-10 18:21:29 +00:00
CRUNCH
482d4b2f75 Adds Lexorin to the Uplink Poison Bottle Bool. Also, Fixes Lexorin. (#24488) 
* lexorin

* Fixes lexorin

* sanity
 2024-03-10 18:21:24 +00:00
McRamon
046c841cab New plasmaman suit - Coke Suit (#24465) 
* all done????

* no

* ave emperor

* aaaand last pixel adjsutment

* Update code/modules/client/preference/loadout/loadout_racial.dm

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

* box name

* Update code/game/objects/items/weapons/storage/boxes.dm

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

* Update code/modules/client/preference/loadout/loadout_racial.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-10 18:19:55 +00:00
Marm
b903c17a06 Adds Secway Crate to Cargo orderables. (#24460) 
* life imitates blart

* Update code/game/objects/structures/crates_lockers/largecrate.dm

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

* Update code/game/objects/structures/crates_lockers/largecrate.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-10 18:19:48 +00:00
Charlie Nolan
36b202bd26 Standardize on exclaiming about committing suicide. (#24433) 
* Standardize on exclaiming about committing suicide.

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

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

* Apply suggestions from code review

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

* I think this is the last of the unexciting suicides.

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-10 18:18:36 +00:00
Charlie Nolan
823589c38c Mice pull cheese wedges under doors (#24432) 
* Mice pull cheese under doors

* Reorder the mouse-cheese logic, looks better this way around.

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

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

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

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-03-10 18:18:11 +00:00
Charlie Nolan
130f323f2d Added a chem heater description to point out that it can cool, too. (#24425) 2024-03-10 18:17:26 +00:00
Mikhail Dzianishchyts
c4d9f3fa15 Allow book printing in Syndicate (#24421) 2024-03-10 18:17:08 +00:00
PopeDaveThe3th
a2a8293e8c Updates names and descriptions of common ballistics (#24416) 
* Updates names and descriptions of common ballistics

* updates WT550 crates, magazines, and ammo boxes

* Update launchers.dm

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

* Update automatic.dm

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

* Update weapon_designs.dm

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

* Update weapon_designs.dm

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

* Update weapon_designs.dm

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

* Update weapon_designs.dm

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

* Update weapon_designs.dm

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

---------

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-10 18:16:42 +00:00