cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,629 Commits 26 Branches 2 Tags
b1be1b5a36cf44d1a9ea36e4c88fdaec0531d3cd
Commit Graph

24759 Commits

Author SHA1 Message Date
Qwertytoforty
b1be1b5a36 Ports TG berserker armor from TG to replace champion hardsuit. (#18854) 
* NT does not recommend punching fauna to death

* need x2, don't want reflection

* Armor -> brute burn resist, speed removed

* phys not species

* light em up

* Apply suggestions from code review

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

* a hex on you

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

* spacing, bolding, only stamina

* Apply suggestions from code review

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-09-06 00:05:36 +01:00
Edan
58f0419399 Legion Rework (#18819) 
* initial changes

* crusher trophy + other changes

* oops

* status effect change

* charlie review 1

* spacing

* sentience type

* Update code/modules/mining/equipment/kinetic_crusher.dm

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

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

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-09-05 01:11:49 +01:00
ElorgRHG
a2aaad2166 Gray black gloves and crappy shine on jackboots begone (#18909) 2022-09-04 17:20:12 +01:00
Octus
1c7882cb11 Ports the TG Dish Drive. A quality of life machine for service. (#18855) 
* ILOVEBARTENDING

* improvements

* oopsie daisy

* Apply suggestions from code review

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

* Update cable.dm

* fixes cable runtimes

* Apply suggestions from code review

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

* applies for code critique

* steelslayerreview

* Update code/game/machinery/constructable_frame.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-09-04 10:36:11 +01:00
S34N
021fd9a416 adds implants and hair gradients to serialisation (#18934) 
removes organ DNA from serialisation
 2022-09-03 21:14:44 +01:00
Adrer
bb12be2ed1 Meteorshot now knocks down instead of stunning (#18955) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2022-09-03 16:22:14 +01: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
S34N
08f36a9521 Admin QoL: Deletes stickybans, tidies mob VV menu (#18943) 
* 1

* 2

* removes these too
 2022-09-02 23:51:00 +01:00
ParaGitV
e13353e77e Spraytan overdose update (#18788) 
* Spraytan Line Updates

* Punctuation update
 2022-09-01 15:20:24 +01:00
Nathan Winters
417ad89267 Small container transfer rate change improvements (#18780) 
* Avoid extraneous warning on `set_APTFT()` cancel

* Add `set_APTFT()` success feedback message

* Standardize `possible_transfer_amounts`

* Cryptic var names begone

* Unhardcode "It will transfer X units" examine note

* Fix grammar
 2022-09-01 13:31:18 +01:00
alex-gh
7e3dda4556 Rework disease outbreak event (#18654) 
* Rework disease outbreak

* Better dchat message

* Mary had a little lamb

* no symptoms for carriers

* Review Fixes part 1

* Review Fixes part 2

* Review Fixes part 3

* Lowers mundane disease probability

* Mundane disease can only happen once

* Improved naming/dchat message

* subtypes!

* space

* fix diseases overwriting each other

* SPAAAAAACE

* dchat message fix

* no initial
 2022-09-01 12:49:27 +01:00
LiberatedWaveMan
980bbb489d Adds a New Drink: The Bilkshake (#18932) 
* Update drinks.dmi

* Update alcohol.dm

* Update drinks.dm

* Update drinks.dm

* Update code/modules/reagents/chemistry/recipes/drinks.dm

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

* Squashed commit of the following:

commit c61a500319
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date:   Mon Aug 29 18:05:38 2022 -0400

    Fixes some broken code with a dirt grenade (#18928)

    * i hate old code i hate old code

    * good fix im so good at code

commit 034a6403da
Author: Gatchapod <20936555+Gatchapod@users.noreply.github.com>
Date:   Mon Aug 29 23:01:52 2022 +0200

    More positions for body scanners and sleepers when using a wrench (#18815)

    * Adds positions to sleepers and scanners

    * Requested changes

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

commit 7b8f0f3d66
Author: Octus <62493359+Tokorizo@users.noreply.github.com>
Date:   Mon Aug 29 11:17:25 2022 -0500

    The Bartender's shaker now acts like a real shaker! (#18852)

    * SHAKESHAKERHSKAERIT

    * Update code/modules/food_and_drinks/drinks/drinks.dm

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

    * maint recommends

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

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

    * STOP SHAKING MF

    * Update code/modules/food_and_drinks/drinks/drinks.dm

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

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

commit 8a10336780
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Aug 29 16:45:49 2022 +0100

    The headcoder shuffle (#18923)

commit 629c099db7
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Aug 29 16:45:29 2022 +0100

    Refactors status displays (#18811)

    * Refactors status displays

    * biggest commit

commit 5d3310cdef
Author: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Date:   Mon Aug 29 15:39:56 2022 +0100

    Bag icons fixes + Extra bag sprites for vox/grey (#18903)

    * icons

    * dufflehandle

* Update drinks.dmi

* Update code/modules/reagents/chemistry/recipes/drinks.dm

thanks hal

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

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

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-08-31 16:07:49 +01:00
Adri
072fc6e1d5 Fixes tower cap logs being choppable in bags (#18939) 2022-08-31 15:06:16 +01:00
Pidgey
ddfecf85f5 - Converts honeycomb from reagent_containers to type reagent_containers/food/snacks. (#18922) 
- Adds honeycomb as an item that can be picked up in plant bags.
 2022-08-31 13:20:26 +01:00
FloFluoro
92f6d88b35 Adds cooldown to Xenomorph neurotoxin, changes stun to knockdown (#18919) 
* Adds cooldown to Xenomorph neurotoxin, changes stun to knockdown

* Neurotoxin now works when implanted in humans

* Tidying

* More tidying

* More tidying
 2022-08-31 13:19:03 +01:00
Contrabang
9e5999e8bc Allows toggling of crate locks with Alt-Click (#18906) 
* wowee! easy of access!

* SR changes

* Revert "SR changes"

This reverts commit 1db0d2c1e6.
 2022-08-31 13:16:50 +01:00
ParaGitV
4c500fb3d6 Golem shells require more dexterity (#18902) 
* Golem shells require more dexterity

* Update check

I'm dumb and forgot ishuman exists

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

* Update check 2.0

Because I'm turbo blind

* Update tres

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-08-31 13:15:50 +01:00
Sirryan2002
b80d9e213d Organ Deletion Upon Removal is now handled by base procs instead of overrides (#18624) 
* organs fix

* minor tweak

* documentation changes

* Apply suggestions from code review

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

* requested changes

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-08-30 12:52:51 -05:00
FloFluoro
13ad05d1c4 Adds Nian to "pickable species" spawner list (#18881) 2022-08-30 16:52:57 +01:00
Octus
7b8f0f3d66 The Bartender's shaker now acts like a real shaker! (#18852) 
* SHAKESHAKERHSKAERIT

* Update code/modules/food_and_drinks/drinks/drinks.dm

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

* maint recommends

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

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

* STOP SHAKING MF

* Update code/modules/food_and_drinks/drinks/drinks.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-08-29 17:17:25 +01:00
AffectedArc07
629c099db7 Refactors status displays (#18811) 
* Refactors status displays

* biggest commit
 2022-08-29 16:45:29 +01:00
Adri
9c1618139b Tweaks some NanoMed Plus products, tweaks mannitol and mutadone pills, renames healing patch (#18904) 
* Changes mannitol and mutadone pills

* Renames healing patch to brute patch

* Removes some NanoMed Plus products

* Moves insulin to contraband

* Removes unnecessary capitalization when it comes to reagent bottles

* Reverts mannitol sprite change

* Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category

* Makes syringes lowercase

* Revert "Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category"

This reverts commit 3d586665fe.

* Renames prespawned advanced analyzers
 2022-08-29 11:10:16 +01:00
alex-gh
1fd6e02af0 Add move resist check to photocopier (#18920) 2022-08-29 11:07:52 +01:00
Vi3trice
b5955dc22d Expand electrochromic devices. Add airlocks, windoors, and window painter compatibility. (#18656) 
* The future is hazy

* Deconflict and linters

* Update windowdoor.dm

* Update airlock.dm

* Update airlock.dm

* What was even the point of visible?

* Fixes

* Update tgui.bundle.js

* Update windoor_assembly.dm

* Update airlock_painter.dm

* Update tgui.bundle.js

* Ain't no wizard

* Update RCD.dm

* Tweaks
 2022-08-29 11:07:38 +01:00
Octus
41b2043120 surgical caps (#18899) 2022-08-28 17:25:46 +01:00
Kugamo
247c7239da InteliCard AI Core Display Sprites (#18821) 
* hi

* bye

* hi again

* Sirryan2002 suggestion

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

* adds unit test

idk what Im doing really here, so I hope this code works 😔 👍

* correction 1

* correction 2

kill me

* correction 3

im dead

* correction 4

big pepega moment

* correction 5

* correction 6

yep

* FINALE :D :D :D

* AffectedArc07 suggested change

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-08-28 14:37:08 +01:00
Qwertytoforty
5fd21ea339 fixes bubblegum / vetus hitting twice during charge (#18837) 2022-08-27 13:05:55 +01:00
AffectedArc07
1c3dc66b79 Refactors light switches, igniter switches, mass driver buttons, and crematoriums? (#18683) 
* A mixed refactor

* Re add link code

* tweak

* well thats embarassing

* Apply suggestions from code review

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-08-27 13:04:31 +01:00
DamianX
19210d108d Remove maintainer verbs from de-admined clients (#18896) 2022-08-26 19:33:32 +01:00
SteelSlayer
f991ad2c07 fix failed give message appearing on success (#18894) 2022-08-26 19:29:49 +01:00
SteelSlayer
44af9906b9 fix give alert staying around (#18887) 2022-08-25 18:24:40 +01:00
Ordosian
9cf1e7e5a6 Large Plasma Tank (#18840) 
* Large Plasma Tank

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

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

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

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

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

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

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

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

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

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

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

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

Co-authored-by: Ordosian <Ordosian@gmail.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-08-25 17:42:17 +01:00
GDN
7e595c4a03 Clarifies that DNA injectors cannot be used with syringe guns (#18846) 
* Alters DNA-Injectors interaction with the syringe gun

Alters the DNA-injectors interacton with the syringe gun

* dna injector

* Further grammer fixes

I fucked up the grammer on a grammer pr lmao

* adds sirryans suggestion for testing
 2022-08-25 16:38:38 +01:00
S34N
41813c3e5f Various fixes and QoL tweaks to labor camp (#18841) 
* gulag QoL fixes

* escape route, analyzer

* stops people from spam calling the shuttle down

* unifies access

* moves ofitser, fixes point claim console

* TGUI build

* unifies point system for good

* TGUI deps

* tweak

* sirryan review

* hard ref removal

* more changes

* scope creep scope creep

* sirryan!
 2022-08-25 16:36:36 +01:00
Edan
baa16534fb PERCENTAGES OVER 100? (#18883) 2022-08-24 18:42:32 +01:00
Luc
ad813f76d9 Allow cursed heart to be defibrillated up to three times (#18677) 
* cursed heart but funny

* Flesh out this version a bit more

* okay fine you get three shots

miner gaming

* Bitwise

* Change wakeup method

* Address Steel's review
 2022-08-24 12:00:25 -05:00
Octus
b8cf8fa091 Vox Hats! (#18835) 2022-08-24 15:58:47 +01:00
SteelSlayer
d355a60a2d Rework / refactor of how the Give verb works. Give now has a re-bindable hotkey for it (#18646) 
* give verb rework ; adds a hotkey for give

* moxian review

* Adds new alert sprite shown to item giver
* Converts offering item trait to a status effect to facilitate the new alert

* Update screen_alert.dmi

* Add a `/datum/proc/signal_qdel()` helper

To cut down on copy and paste. Fixed alert flash icon not having transparency.

* lewcc review

* farie review and other fixes

For some reason my alert flash sprite no longer had an empty frame at the end so it would reach the end of the animation and be a solid yellow outline instead of invisible.

Touched screen_alert.dmi to fix that.

* reverts the addition of the give hud icon, restores give verb

I realized that making a new hud icon button would require multiple hud icons for each hud theme (the red one, green one, white one, etc.). I'm not prepared to do that much work right now.

* Update code/modules/mob/living/carbon/give.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-08-24 14:51:05 +02:00
GDN
28137689b8 Swarmer removal (#18873) 2022-08-22 19:50:18 +01:00
FloFluoro
83d1058b1a Fixes emagged deep fryer softlocks (#18874) 2022-08-22 19:21:29 +01:00
Qwertytoforty
a015d69797 fixes reactive armors working with no charge GBP NO UPDATE (#18877) 
* FUCK

* free of charge code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* !cell.use

* Add grace back in

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-08-22 17:58:58 +01:00
AffectedArc07
8ec53aca7a Server regions (#18867) 2022-08-21 21:27:23 +01:00
Qwertytoforty
afbae8af1b Makes anomalies deadlier (#18836) 
* Makes anomalies deadlier

* Apply suggestions from code review

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

* undodgeable to dodgeable

* requested changes

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-08-21 16:32:12 +01:00
Qwertytoforty
d6e24aa850 hierophant staff / blue / red cube no longer ignore teleport blocks (#18868) 2022-08-21 09:31:16 +01:00
AffectedArc07
400e9f8c65 Removes lavaland swarmer crash ruin (Its already disabled on the server anyway) (#18810) 
* Removes lavaland swarmer crash

* Forgot the def
 2022-08-20 17:48:52 -05:00
Edan
f82353421f i have made a severe and continuous lapse in my j (#18863) 2022-08-19 15:21:02 +01:00
Edan
87109a29d4 fix (#18856) 2022-08-19 13:11:53 +01:00
AffectedArc07
4140275ca8 Axes TS gateway (#18825) 
* Axes TS gateway

* This too

* Commit for MDB

* This PR finna become my MDB2 test

* aaaaaaaaa
 2022-08-18 23:48:29 +01:00
Vi3trice
f41e0f111d External organ icon handling tweak (#18826) 
* Hm, let's try this

* Nevermind, a new proc is better than doing a bunch of early returned jumps
 2022-08-18 23:24:24 +01:00
Qwertytoforty
7cd42a835e Elite balance tweaks (#18834) 
* Elite tweaks

* sirryan changes

* a periodic issue

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-08-18 23:15:06 +01:00