cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-07 08:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,445 Commits 26 Branches 2 Tags
576cbdcf25ee430b99d09232a384a7e2df6bd0d9
Commit Graph

26838 Commits

Author SHA1 Message Date
Deniz
576cbdcf25 Cargo "View Contents" Fix (#24562) 
* contains_special

* contains special list additions

* keep on testing

* moar

* test test

* get manifest

* make sure

* indentation mistake
 2024-03-18 18:32:33 +00:00
Mikhail Dzianishchyts
435fbb6a58 Make gravity generator power-dependent again (#24601) 2024-03-18 18:31:31 +00:00
BiancaWilkson
c6c88118a7 adds extra check (#24648) 2024-03-18 18:30:39 +00:00
Charlie Nolan
a5aa7d923b Retaliate mobs no longer break stuff after revived with a laz injector. (#24665) 2024-03-18 18:25:35 +00:00
Charlie Nolan
13f0d607d6 Make pAIs show correctly in diagnostic HUDs (#24666) 2024-03-18 18:25:12 +00:00
Charlie Nolan
153284efae Fix mime/clown picked names not being on their bank account. (#24669) 2024-03-18 18:23:36 +00:00
Mikhail Dzianishchyts
e92e3a84cf Update gun icon on knife removing (#24674) 2024-03-18 18:22:56 +00:00
Qwertytoforty
c8dde43856 fixes admin shuttles breaking the escape shuttle / not working (#24677) 2024-03-18 18:13:44 +00:00
Contrabang
664b04a1cb goodbye exclaims (#24593) 2024-03-18 18:04:14 +00:00
Charlie Nolan
fa9246ec60 Capitalized Comfrey. (#24642) 2024-03-18 17:55:38 +00:00
Adrer
dabcd51fd2 Makes headslug mob_size MOB_SIZE_SMALL (#24623) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-03-18 17:54:50 +00:00
Marm
fdef20cc9e Adds Meson Sunglasses (#24619) 
* meson sunglasses

* species sprites ew

* why

* Update code/modules/clothing/glasses/glasses.dm

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

* eeh

* Apply suggestions from code review

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

* Apply suggestions from code review

Self commit time (With approval)

---------

Co-authored-by: 1080pCat <96908085+1080pCat@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-03-18 17:54:24 +00:00
LtDiggs
6f632040aa Adjusts Species Lung Temperature Tolerances (#24509) 
* Adjusts Species Temperature Tolerances

* Update code/modules/surgery/organs/organ_datums/lung_datum.dm

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

* Adjusts Unathi and Ashwalker to match #23325

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-18 17:53:04 +00:00
Contrabang
df29a55f54 niche case (#24595) 2024-03-18 17:52:22 +00:00
cybercapitalism
f31961a97d Modsuit activation/deactivation is no longer cancelled by user incapacitation (#24564) 
* changes activation do_afters to not check for incapacitation

* fix spacing
 2024-03-18 17:51:28 +00:00
CRUNCH
926dff2cf1 Cyborgs drop their upgrades on the floor when reset or deconstructed (#24467) 
* 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

* yes

* Update robot_mob.dm

* Update robot_mob.dm

* Update code/modules/mob/living/silicon/robot/robot_mob.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-18 17:44:27 +00:00
cybercapitalism
cb7cf57c85 oops (#24658) 2024-03-17 19:24:07 +00:00
Contrabang
9b24572ed5 Updates OpenDream pragma file (#24516) 
* hell yeah-coded

* welp im too tired to fix this one

* lets test this

* Revert "lets test this"

* okay, lets test!

* fixes

* okay we good?

* i might be stupid
 2024-03-17 11:56:56 +00:00
Contrabang
2ec55dbfbb Datumizes Cult. (#24379) 
* cult 1

* massive data refactor

* progress

* More crap

* IM SCARED IT COMPILES

* oops

* more fixes

* good comment

* hell yeah, team control

* lol

* blamo

* blam

* More stuff

* team refactor

* epic merge fail

* src not _src_

* more

* progress

* cult

* more stuff

* water

* goodbye __IMPLIED_TYPE__

* time to undraft

* FUCK FUCK FUCK

* okay this is better

* goodbye todos

* fix

* order of operations

* last fix? maybe

* yeah

* oops

* okay this should be ALL the fixes

* wow

* hell yeah

* wow

* fixes duplicate teams + adds more team safeties

* how the fuck did this happen

* admin objective improvements

* wah more bullshit

* guh

* fuuuuck

* fucking hell

* fixes
 2024-03-16 20:36:55 +00:00
JimKil3
0c25bf4a21 Cloning Rework (#21683) 
* guts the cloning pod

* guts cloning console (except the tgui)

* clonescanner, more gutting, linkage

* reagent stuff

* `cloning_data` datum

* scanner inserting/removing

* scanning logic

* auto-linkage

* `get_cloning_cost()` in its entirety

* logic for which limbs to grow

* RefreshParts() and insert_organ()

* removes misinformation

* robot parts

* more organ insertion logic

* more organ code :D

* create_clone

* beginnings of clone logic

* cloning addl. stuff

* cloning finalization

* fixes CI?

* whitespace fixes (regex edition)

* ejection logic

* Update code/game/machinery/clonepod.dm

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

* stuff

* stuff 2

* update_icon_state stuff

* clonepod TGUI

* organ fix yipee

* cloning console UI beginnings

* cloning console main menu

* reagents stuff

* beginning of damage tab

* damages menu skeleton

* aiuhgugh

* splits up code

* ejecting patient updates ui

* contra reviews

* temp fix for CI

* tgui finished? (clueless)

* Cloning :D
it's done

* manual & tweaks

* more feedback!

* cooldown
because you can spam the fuck out if it otherwise and it's really loud for the ghost

* oops

* tweaks

* edits EVERY MAP OH GOD

* no link stuff

* oops

* Apply suggestions from code review

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

* Apply suggestions from code review (pt. 2)

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

* Update code/game/machinery/computer/cloning.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>

* dgamer review

* Update code/game/machinery/clonepod.dm

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

* Apply suggestions from code review

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

* henri stuff

* makes it compile

* builds tgui (oops)

* rebuilt bundle i guess?

* not stale i swear

* fixes

* whoops

* countdown stuff

* sirryan review pt. 1

* sirryan review pt 2

* every day i'm shuffling (or something idk)

* wasdfhdfg

* sean clonepod.dm changes

* update_icon(UPDATE_ICON_STATE)

* Update code/game/machinery/clonescanner.dm

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

* icon stuff

* map weirdness

* henri disks

* unfucks maps?

* cc maps

* eject button

* Apply suggestions from code review

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

* Update code/game/machinery/clonepod.dm

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

* dgamer review 2

* ourgh

* dgamer review 3

* waaaah

* fixes access locks

* fixes
Fixes the numbers issues (and no feet hopefully?)

* re-adds feet

* more fixes yipee

* un-biomass

* fixes ghost stuff

* exploit fix

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@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: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-16 16:51:13 +00:00
warriorstar-orion
08f9a8129b use directional helpers for ATMs (#24426) 
* use directional helpers for ATMs

* updatepaths script PR number

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-16 16:25:30 +00:00
DGamerL
1799458add Overrides the proc (#24635) 2024-03-16 16:15:43 +00:00
Adrer
426ee61c60 Plasma cutter no longer requires a permit (#24622) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-03-16 16:15:03 +00:00
Luc
a65809e32f Adds an action button for succumbing, broadcasts last words (#24501) 
* succumb

* Apply suggestions from code review

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

* capitalize

* clear the alert, and no more last words when you're already dead!

* Update code/modules/mob/living/death.dm

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-16 16:13:30 +00:00
Aylong
dcb0167ce8 BSA UI size fix & TGUI input list (#24500) 
* BSA UI fix & TGUI input list

* Rebuild
 2024-03-16 16:12:45 +00:00
GDN
4cf311cbf2 Reworks last resort. Reverts #23992 (#24389) 
* Reworks last resort. Reverts #23992

* forgot to push these

* projectiles no longer pass over headslugs
 2024-03-16 16:12:09 +00:00
CRUNCH
9c338a3dc3 Edits the descriptions of the MMI and SMMI, adds extended description to both (#24343) 
* DEEP LORE!

Edits the descriptions of the MMI and SMMI and gives them extended descriptions.

* Spiderbots exist

I forgot about them but they do be real

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

* Update code/modules/mob/living/brain/MMI.dm

---------

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-03-16 16:10:51 +00:00
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