cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 08:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,130 Commits 29 Branches 2 Tags
59451b0c44e81d58f2e1563677dd4e8a0fc6ded6
Commit Graph

39529 Commits

Author SHA1 Message Date
Luc
59451b0c44 Fix users being able to unintentionally emote while fake dead (#18259) 2022-07-08 17:57:58 +01:00
Sirryan2002
570c1b2f73 Resets Click Delay after removing Handcuffs (#18250) 
* fix

* reviewing commits before opening PRs is for the weak

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

Co-authored-by: moxian <moxian@users.noreply.github.com>
 2022-07-08 17:57:04 +01:00
KalevTait
f5d19f283f Code Readability - Surgery (#18238) 
* surgery

* remove unused helper functions
 2022-07-08 09:20:37 +02:00
KalevTait
3bd7952ffb guns (#18237) 2022-07-08 09:18:54 +02:00
KalevTait
3067e4eb0f hydroponics (#18234) 2022-07-08 09:16:52 +02:00
Marm
5891c2b644 Reworks Flashbangs (#18189) 
* Reworks Flashbangs

Flashbangs no longer weaken, instead causing those affected to crawl and additionally makes them confused.

* Hippie Repellent

Reworks Flashbangs. Converts weaken to crawling. Adds confusion.

* Riot Control

Fixes a typo.

* Update code/game/objects/items/weapons/grenades/flashbang.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-07-07 22:18:51 +01:00
Qwertytoforty
23ec577586 Changes weapon knock downs to knockdowns (#18212) 2022-07-07 20:25:19 +01:00
Sirryan2002
d8cde4f3ab Holodeck claymores & eswords can only block holodeck items (#18229) 
* fix

* also esword

* implement changes + better scoping

* oops

* comment cleanup

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-07-07 20:24:58 +01:00
Sirryan2002
05695d6096 [TGUI] Destination Tagger (#18155) 
* Ports Destination Tagger to TGUI

* cleans up styling

* reduced window width

* code cleanup

* Apply suggestions from code review

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

* implements other requested changes

* tgui fix

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: moxian <moxian@users.noreply.github.com>
 2022-07-07 19:22:22 +02:00
Qwertytoforty
c0802f2b90 Adds teleportation sickness to bluespace gene plants and bluespace crystals (#18218) 
* Adds teleportsick to bluespace genes and bluespace crystals

* Update code/datums/status_effects/debuffs.dm

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

* named stuff

* changes order

* Update code/datums/status_effects/debuffs.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-07-07 11:32:47 -05:00
Bm0n
1d0e3dde0f Updates a considerable amount of legacy weapon sprites to modern TG/Bay versions (#18118) 
* test

* holdup

* more guns

* EVEN MORE CHANGES

* fuck

* eugh

* actual shit editor, love DM

* i think I just need inhands now

* final review, test pr

* ooops

* holy shit

* new maka

* foamforce new makarov

* this is going to be hell to review. is it?

* AHHHHH

* small melee fixes

* GOD DAMN STAFF

* as above

* i thought i fixed you, also grip added to wt550 inhand

* acutally deconflicts with the new camera pr, removes the new animated missle(rip)

* some fixes

* a bit more sprite cleaning

* i am suffering

* reverts 9mm

* seemingly forgot a few

* i think we're good now
 2022-07-07 17:12:28 +01:00
KalevTait
cf640e5195 Code Readability - Food (#18211) 
* food

* implemented requested changes
 2022-07-07 11:51:15 +01:00
AffectedArc07
0060c3a2f3 More ebeam GC fixes (#18240) 2022-07-06 17:52:16 -04:00
Qwertytoforty
47c054917e Stops explosions causing ebeams to fail GC (#18236) 2022-07-06 21:20:47 +01:00
datlo
47e52b0c60 Adds a greytide themed wizard loadout with His Grace (#18095) 
* Adds a greytide themed loadout

* increase size of magical box

* Update code/game/gamemodes/wizard/wizloadouts.dm

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

* add trailing new line

* handle plasmemes/voxes

* tweak to_chat for plasmamen

* Fix wizarditis removing plasmaman helmets

* Replace teleport by force wall

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-07-06 21:18:56 +01:00
KalevTait
7e43f1c2e5 Code Readability - Gamemodes (#18142) 
* changed fake disintegrate to not need a permit (as far as sec bots are concerned)

* prefer boolean defines to magic numbers

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

* added check

* spells

* gamemodes

* Revert "spells"

This reverts commit 66e3c7c57b.

* Revert "added check"

This reverts commit 082aa40246.

* removed commented out line

* delete borer, to fix merge issue

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-07-06 21:40:14 +02:00
AffectedArc07
4ca73fc3cd God damn I am dumb (#18233) 2022-07-06 20:21:24 +01:00
Qwertytoforty
d3d40b79a6 Axes prescanning. (#18220) 
* Axes prescanning.

* tgui pls don't kill me
 2022-07-06 19:50:38 +01:00
Viz
24248d0ccb Removes instant stuns from Sleeping Carp (#18219) 
* open rp, kicks ur ass

* Stay down

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

* Get your fins off me!

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-07-06 19:50:13 +01:00
Charlie
3980f2dd77 stun and telebaton rework (#18127) 
* stun and telebaton rework

* batons now do stamina

* makes it work

* indicator

* tweaks

* farie review

* moxian review

* sod it
 2022-07-06 20:46:52 +02:00
KalevTait
b7dad1801d terror spiders (#18216) 2022-07-06 19:32:44 +01:00
alex-gh
9f501213d6 Inserting the gland now mends the bones (#18224) 2022-07-06 19:32:13 +01:00
Sirryan2002
0c80bda49d adds istype check (#18228) 2022-07-06 19:31:46 +01:00
KalevTait
d8b3275213 hostiles (#18230) 2022-07-06 19:31:29 +01:00
KalevTait
1ba1f89a96 Code Readability - Clothing (#18178) 
* clothing

* removed implied src

* Remove 'as mob' as per suggestion

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

* use #define SECONDS as per suggestion

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

* Apply suggestions from code review

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

* Prefer BURN to "fire"

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-07-06 12:49:21 +02:00
Viz
8d1e1bd183 Makes bolas knock down instead of stunning (#18207) 
* Bola stun't

* now with extra readability

* hold on a minute
 2022-07-05 23:53:10 +01:00
alex-gh
fc2b99bd51 Surgery refactors (#18183) 
* Remove dead code

* Refactor magic numbers to defines
 2022-07-05 21:20:38 +02:00
S34N
1ad219e02a Revives "Updates ERT gear and adds holo stretcher #16266" (#18139) 
* Updates ERT gear

* Apply suggestions from code review

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

* Reformats new vars

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

Code Clarity

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

* Removes unneeded item

* BULK

* repath time

* moxian review

* le beds

* haha webedits

* bubble review

Co-authored-by: warior4356 <warior4356@yahoo.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2022-07-05 18:47:20 +02:00
KittyNoodle
a1cc619421 Punch stuns now knockdown instead of hard stunning. (#18191) 2022-07-05 16:10:58 +02:00
Vi3trice
179b75f3a7 Gloves, shoes and suit storage are properly obscured on the player when wearing the appropriate gear (#18190) 
* nothing at all

* Oh, and the blood too.

* Oh, and blood
 2022-07-05 16:07:17 +02:00
LightFire53
3cfdc8dc62 Adds Security Jetpack to Security Suit Storage Units (#18181) 
* Highway to the Danger Zone

* Harness the power

* Security Jetpack 2: Electric Boogaloo
 2022-07-05 15:45:17 +02:00
KalevTait
bdf50ea894 Code Readability - Machinery (#18153) 
* machinery

* comment change as per suggestion

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

* added always_gib var to recycler as per recomendation

Co-authored-by: moxian <moxian@users.noreply.github.com>
 2022-07-05 15:38:47 +02:00
S34N
52f3323760 makes these lasers (#18209) 2022-07-05 13:41:48 +01:00
KalevTait
ad608c84e3 atmospherics (#18152) 2022-07-04 10:41:18 -05:00
Viz
c644fd0384 I HATE INSTANT STUNS! I HATE INSTANT STUNS! (#18196) 2022-07-04 09:28:22 +02:00
Farie82
422f40b670 Makes it so the baseturf on lavaland is lava, not space (#18193) 2022-07-03 22:28:19 +01:00
Viz
77767b8986 Untases your slug (#18185) 2022-07-03 22:12:44 +01:00
Vi3trice
38c4d55204 Operative nuke spawns in the right place (#18199) 
* Ah yes, nukes

* Oh that works too.

* Update nuclear.dm
 2022-07-03 20:51:30 +01:00
Charlie
9a8647194f buckling (#18203) 2022-07-03 20:51:21 +01:00
KalevTait
36130193b5 Code Readability - Pipe Dispenser (#18169) 
* pipe_dispenser

* prrefer wrench_act for wrench use

* Use User, Not Usr

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

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@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-07-03 18:55:11 +01:00
GDN
da94f63251 Nerfs telekinesis (#18177) 
* tk nerfed from .3 to 3 seconds

* Update telekinesis.dm

* removes those (), I didn't need em
 2022-07-03 13:25:09 +01:00
PacifistDalek
bfdce2966a Absolute Heresy (#18182) 2022-07-03 12:09:57 +01:00
Contrabang
41b231a9a0 update config comments to be accurate (#18175) 2022-07-03 12:08:35 +01:00
moxian
e3b5527576 Fix several runtimes with remote welderbombing (#18137) 2022-07-03 00:38:01 +02:00
Kugamo
9a8d6da7ab New TEG sprites (#18085) 
* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* T E Gee

:D

* adjusts sprites slightly

TEGs taller now, I though they looked too short b4

* makes pipe connection nicer

* Emissive Devices

yep

* suggested changes

Moved update_icon() call out of atmos/process, which was calling it multiple times a second, and into return_transfer_air() which is the only place where the critical variable is redefined.

* readds conflicted changes

* bruh

* SteelSlayer Suggestion

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

* removes duplicate proc

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-07-02 12:45:24 -05:00
KalevTait
8dc53fc65e Code Readability - Doors (#18149) 
* doors

* return TRUE

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

* return TRUE

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

* return TRUE

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-07-02 17:34:38 +01:00
KalevTait
89ba9c047c Code Readability - Effects (#18150) 
* effects

* removed anchored = TRUE from objects that inherit that property within the effects folder and subfolders
 2022-07-02 16:48:46 +01:00
AffectedArc07
3c00a1f061 Removes cortical borers. No, I am not sorry. (#18161) 
* Removes cortical borers. No, I am not sorry.

* Icon purge
 2022-07-01 23:25:01 +01:00
Kugamo
26bd519465 [GBP no update] Fixes Possible Firealarm spam (#18143) 
* Yep

* SteelSlayer Suggestion

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-07-01 17:20:42 -05:00
KalevTait
f6646447f3 Code Readability - Computers (#18147) 
* computers

* Remove src.

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

* remove src.

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

* change var name 'screen' to 'authenticated'

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-07-01 17:02:55 -05:00