cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 01:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,326 Commits 26 Branches 2 Tags
e957dc6cd1908a72fc1b6221044cfec5dbe5c1c7
Commit Graph

38904 Commits

Author SHA1 Message Date
mochi
e957dc6cd1 Fixes runtime on table frame completion 2021-11-15 09:16:57 +01:00
Charlie
634f9c72f1 Vampire Rework. (#16476) 
* vampire rework

* fixes and tweaks

* cleanup + tweaks

* grug stomp

* TGUI

* TGUI rebuild

* UID fix

* debugging cooldown fix

* first review changes

* subclass refactor

* tweaks + some sprites

* blackbox logging

* tweaks + grammar

* minor UI tweaks

* ability icon sprites.

* placeholder sprite warning fix

* melee mod code comment warning

* nullification rework

* final sprites!

* fixes

* sabre review pt 1

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* sabre review pt2

* sprites readd

* tgui rebuild

* removes traitor vampires

* fixes

* readds sprites

* runtime fixes

* hotfix

* more runtime fixes

* glare tweak. less confusing when the vampire is stunned.

* gargantua nerf

* minor tweaks.

* hemomancer nerfs

* bugfixes and cleanup

* I did a dumb

* couple of fixes

* confusion and shadow snare fixes

* hemomancer nerfs part 2 electric boogaloo

* TGUI rebuild

* fixes and easier events

* Umbrae tweaks

* gargantua tweak

* umbrae nerf 2 electric boogaloo. also var edit suggestion

* runtime fix

* buffs blood nutrition to be in line with its metabolic rate

* Henk stuff

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

* more review changes

* final tweak

* affected request + runtime fix

* FUCK

* fat fucks

* darkness tweaks

* UMBRAE AAAAAAAAAAAAAHH

* force doors bugfix

* either git or I am drunk

* admin rejuv fix

* I CANNOT SPELL

* shitnt code

* steel review

* tgui rebuild

* mochi review

* vampire ability usage logging

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-11-14 15:34:56 +01:00
Charlie
46d3759216 Fixing jaunting not teleporting you to the correct turf. (#17094) 
* jaunt fix

* fix part 2, actually fixes it edition

* fix part 3, no revert edition

* fix part 4, in spaaaaaaace
 2021-11-14 15:25:22 +01:00
Fox McCloud
78158de886 Optimizes Organ Processing (#17096) 2021-11-14 09:37:50 +01:00
Qwertytoforty
44bbfd7bd1 Fixes revenant ability bug 2021-11-13 23:52:37 -05:00
Charlie
236e815dbd Refactors revenants. makes them use UIDS, less istyping (#17059) 
* initial commit

* I am tired okay?

* overload lights refactor

* review

* Review stuff

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

* Chaos is a ladder

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

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-11-13 16:26:45 +01:00
Fox McCloud
65f28dcfa5 Removes Parallax Animate (#17083) 2021-11-13 16:19:01 +01:00
datlo
f92f20c74c Fix cult structure stacking exploit (#17091) 2021-11-13 16:15:24 +01:00
datlo
45d005f2c7 Fix cursed clown/mime masks (#17087) 2021-11-13 13:41:44 +01:00
datlo
3d907490a8 Prevent drawing teleport runes in the gateway (#17086) 2021-11-13 13:37:30 +01:00
Fox McCloud
f12251aab0 Fixes Jitter Animation (#17085) 2021-11-13 12:35:16 +01:00
Paulo Elienay II
370c674200 Cult veil-torn text appears to lobby players #17009 (#17011) 
* fix: #17009

* style: requested changes

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

* fix: requested changes

* Update code/modules/power/singularity/narsie.dm

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

Co-authored-by: Elienay Albuquerque <paulo.albuquerque@mv.com.br>
Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-11-12 15:16:42 +01:00
SteelSlayer
de0853e2a0 ashstorm mmi fix (#17065) 2021-11-12 13:36:57 +01:00
Charlie
41e774ab7f Sling veil now properly updates plasmamans helmet sprites. (#17072) 
* fix

* fix prt 2
 2021-11-12 06:22:30 +01:00
mochi
f7701c65d6 Fixes hair for IPCs 2021-11-11 22:52:47 +01:00
Fox McCloud
8061afa550 Merge pull request #16172 from dearmochi/hair-gradients 
[READY] Port hair gradient customization
 2021-11-11 15:40:21 -05:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
variableundefined
6ece7187a0 Merge pull request #17068 from farie82/fuel-tank-bullet-fix 
Shooting fuel tanks now is logged properly and objects that get qdeleted by bullets now only get hit once
 2021-11-11 14:09:04 -06:00
joep van der velden
39a280effd Shooting fuel tanks now is logged properly 
objects that get qdeleted are only hit once by bullets
 2021-11-10 10:23:47 +01:00
Fox McCloud
e2c10ec83d Merge pull request #16775 from Qwertytoforty/RIP-AND-TEAR-but-not-nightmare-mode 
Nerfs (S)laughter demons
 2021-11-08 14:40:57 -05:00
Fox McCloud
308814c0d9 Merge pull request #17025 from matttheficus/DownWithSpeed 
Removes Leg Muscle Stimulus from DNA Vault
 2021-11-07 23:59:18 -05:00
Miraviel
8436e60cba Update vending.dm (#17014) 
Re-adds officer's cap to SecDrobe, alphabetizes the list
 2021-11-07 19:24:43 +01:00
Qwertytoforty
1e66469676 Adds an event that uses the base slaughter demon, rather than midround 2021-11-07 12:37:10 -05:00
variableundefined
9f2f9ac45e Merge pull request #17038 from E-MonaRhg/carpet-stuff-two 
The Subsequent Carpet PR: tweaks and tables edition
 2021-11-07 10:24:47 -06:00
Charlie
126ab04480 Fixes krav's animations (#17052) 
* disarm animation

* combos
 2021-11-07 09:05:02 +01:00
Cocacolagua
2d8f2f75bc Wall-locker fixes (#17051) 
* fixes wall lockers

* removes invisible locker
 2021-11-07 09:02:56 +01:00
S34N
44c12c6d9d Fixes open crate sprites (#17050) 
* fakin underscores

* more crates

* sneak this one in too
 2021-11-06 21:42:47 +01:00
variableundefined
1739f411a2 Merge pull request #16823 from S34NW/3/4th-closet 
3/4ths Sprite Project: Closets
 2021-11-06 14:19:14 -05:00
S34N
e76eb297d5 Reactive armour now logs any damage done (#17030) 
* fire from reactive incendiary now logs

* other armours too
 2021-11-06 11:22:28 -06:00
Farie82
d9f4553c54 Adds attack logging to the rev drain ability (#17036) 2021-11-06 11:22:07 -06:00
SweetBlueSylveon
2fdcbf8551 Grey Plushie Get! (#16991) 
* Adds a Grey Plushie

Adds a grey plushie to the game, putting it as a loadout option, and adding a new sprite.

* Adds water interaction

Adds a water_act to the plushie. The plushie will now changed to "grey_singed" when touching water.
Upon touching water the plushie will scream and go "AAAAAH!" which then puts all text and audio interactions onto a 300 cooldown.
The plushie can also be hugged to make it go "Ow..." if its icon is set to singed. This is on the same cooldown as vox screams.

* Minor fixes

Fixes minor syntax and redundancy problem in the code.

* Updated sprite

Adds new sprites for grey_plushie and grey_singed.

* Converts Cooldown and spawn system to timer.

Changes the cooldown and spawn system to a timer and callback system.

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

Adds early return.

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

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

Simplifies code, corrects mistakes.

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

* Complicated

-Splits the cooldown variable and proc into two, one for hugging one for screaming.
-Adds more BOOLEAN
-Properly implements Timer and Callback system.
-Adds early returns.

* Revert "Complicated"

reverts dme changes.

* Adds an if statement

Adds an if statement so that the server is not setting the icon and description every time the plushie gets wet.

* Minor correction

Fixes the order of the if statement and changes its type.

* Reverts test change

Last commit had testing changes I failed to revert before pushing.

* Changes the sprite.

-New, smaller icons.
-Slightly heavier shading.
(Can be undone and edited further, I still have the other sprites)

* Another sprite update

-I learned to use HSL.

* Small bugfix

Last code update I wrapped the screaming proc into the "don't set the icon and description if it's already singed" by accident. Swapping them around fixed it, and it will now be able to yell from water every 30 seconds again.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-11-06 17:34:17 +01:00
Charlie
7afeb9a4f9 fix (#17043) 2021-11-06 15:08:37 +01:00
E-MonaRhg
ac68ea59df Carpet and table stuff 2021-11-05 19:46:42 +02:00
variableundefined
f11ad29e8d Merge pull request #16824 from PacifistDalek/burger-tg-sprites 
TG Sprite Porting: BURGERS Edition
 2021-11-05 08:39:53 -05:00
variableundefined
97a88da9a9 Merge pull request #16895 from lewcc/vomit-comet 
Nutriment Pump Implants make you projectile vomit when EMPed
 2021-11-05 08:38:30 -05:00
variableundefined
6102145ded Merge pull request #16909 from S34NW/tg_plant_stuff 
Ports better grass and jungle objects used in TG
 2021-11-05 08:37:54 -05:00
AffectedArc07
db3a3c8bc2 Adds Paradise API support (#16981) 2021-11-05 14:04:49 +01:00
Luc
9f67e43493 Prevents usage of martial arts with the passive trait (#16988) 
* Prevent passive mobs from using martial arts

* Update laser reflection, clean up combo message

* Silence annoying message

All martial arts just check if the user is a pacifist or not before executing
 2021-11-05 10:23:26 +01:00
Farie82
3bbe06f3fe Makes it possible to announce the ERT denial to the crew (#16842) 
* Makes it possible to announce the ERT denial to the crew

* can deny ERT now when sender is KO or has no headset
refactored the stuff around it

* Apply suggestions from code review

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

* Sabre's review
Message format for the input
Early return

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-11-05 10:18:53 +01:00
datlo
d94210031b Refactor C4, subtypes, and airlock ex_act (#16995) 
* Refactor C4 and Airlock ex_act

* update uplink desc

* Replace ismob by carbon, clarify comment

* remove unnecessary ismob check

* replace destroy by qdel, fix comment

* auto doc comments, add else condition

* Add comment to shaped c4

* Shortens shaped boom proc, make airlocks more resistant against light ex
 2021-11-05 10:12:09 +01:00
Vi3trice
640a20878a Item attacks send no logs if they have no force (#17029) 
* Hush if no force

* Move it to the other force check instead
 2021-11-05 10:01:58 +01:00
hal9000PR
3b7e9fee93 refactors butchering of humans with chainsaw/meatcleaver (#16812) 
* traits

* examine

* I am incapable of writing

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

* people

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-11-05 09:11:10 +01:00
SabreML
1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906) 
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
 2021-11-04 19:47:31 +01:00
Fox McCloud
705768abd6 Merge pull request #17010 from S34NW/electrochromic_spawner_thingy 
Passes ID var from window spawners to electrochromic windows
 2021-11-04 14:09:34 -04:00
Paulo Elienay II
7abc485a78 Unable to remove solar panel assembly from a bag of holding #17021 (#17023) 
* fix: #17021

* style: project style

* refactor: project style

* refactor: requested changes

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-11-04 19:00:21 +01:00
S34N
53d8fe677d Update code/game/objects/effects/misc.dm 2021-11-04 17:50:44 +00:00
variableundefined
2684afc85b Merge pull request #17027 from Sirryan2002/birdsarentreal 
Fixes a spelling mistake in implanter.dm
 2021-11-03 20:08:01 -05:00
variableundefined
4456caf3cb Merge pull request #17028 from paulo-e/fix/17016 
Ash Walker wasn't an offstation role #17016
 2021-11-03 20:07:07 -05:00
Elienay Albuquerque
1660df05ff fix: requested changes 2021-11-03 16:55:04 -03:00
Elienay Albuquerque
fa503a9fc8 fix: #17016 2021-11-03 10:56:20 -03:00