cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,183 Commits 15 Branches 2 Tags
2d4124d5d3cb8790e0fbfdc15270ce0813c94de4
Commit Graph
39574 Commits
Author SHA1 Message Date
S34N 2d4124d5d3 Merge branch 'master' into lets_go_rebind_things 2022-07-09 17:55:37 +01:00
ContrabangandGitHub 6a9b69fff8 Changes Coroners, Robotics, and RD lockers to be coded, not mapped (#18049) 
* from maps to code

* robotics's headset moved into locker

* deconflicttttt
 2022-07-09 15:30:16 +01:00
ContrabangGitHubCharlie
 		b2bdb80ec5 Refactors Deathsquad, adds more customization to their spawning (#18135) 
* a new coat of paint

* no shooting teammates on spawn for 100 damage

* datumization part 1, makes DS more OP, spacing fix

* hnng still broken but better

* breaks stuff less 99%

* mostly tgui

* oops, removes left over things from testing

* seperate tgui

* undo changes to ERT file and ERT manager

* build TGUI, front end is working

* minor fix, still broken

* this hurts me

* few small changes

* please dont fail

* mind code runs, but it doesnt work

* logging good, tgui built, will finish later

* mind code hurts, tgui should deconflict

* part one of giving up on TGUI

* 3 days of debugging, 2 lines of errors fixed

* no more unneccessary spawners

* Revert "no more unneccessary spawners"

* wow it works

* tgui, deconflict please

* a little clean up

* little more cleanup

* Sirryan addressed pt1

* Oops should commit this before the next commit

* DS isnt an option in one click antag, nuke it

* oops forgot this one small bit

* wow, simple code works

* oops, forgot to address, doesnt fix headset

* ds headset was broken long ago

* removes testing implants

* addresses requests

* get addressed code, you will be good

* few code improvements

* address moxian

* Makes deathsquad naming consistent

* this comment is true again

* a little precaution to stop AFKs

* no nuke code? no problem

* bing bam boom, more addressing

* no more runtimes I think

* clarified a few things

* gloves now show again following #18190

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

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

* okay I'm a bit stupid

* deathsquad jumpsuit desc update

* CI my beloved, have a fix

* deathsquad gets their proper icon

* Revert "deathsquad gets their proper icon"

This reverts commit a52519305b.

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-07-09 15:25:35 +01:00
KalevTaitandGitHub e9172d3352 fixes but with removing a card from hand (#18299) 2022-07-09 15:13:21 +01:00
KalevTaitandGitHub 4c69495219 Fixes bug with crawling through vents into unconnected vent. (#18298) 
* fix

* removing unused variable
 2022-07-09 15:12:27 +01:00
Vi3triceandGitHub 8334a8ca79 Well (#18289) 2022-07-09 15:11:50 +01:00
LightFire53andGitHub e301dc433a Adds Airlock System to BoxStation Supermatter Engine (#18013) 
* Concepts

* Pipes and Lights

* THERE YOU ARE

* Bring it line

* Area

* Meteor Shielding

* In Which We Repipe the Engine Room

* Re-areas about half of engi

Separates the engine room, and re-areas the "main" engi hallway between airlock
and the CE Office/Equipment to be a hardsuitstorage

* Now with 100% more of Sean's Flaps

* Missed a spot

* Atmos Doors

* Don't Map When Tired

* Power

* This is not a cry for help

Sean made me do this.
 2022-07-09 15:11:25 +01:00
Sirryan2002andGitHub 4195c9c9da fixes ponies shitcode (#18286) 2022-07-09 15:10:42 +01:00
LucandGitHub 34e8f36327 Ensure emotes are only routed to the user (#18285) 2022-07-09 15:07:58 +01:00
KugamoandGitHub b72859dd99 Fixes invisible pipes while pipecrawling (#18163) 
* okay

* removes unnecessary changes

* also fixes vent crawling through trinary devices

* Squashed commit of the following:

commit 69fb7ad265
Author: Kugamo <thekugamo@gmail.com>
Date:   Mon Jul 4 21:02:30 2022 -0500

    blah

commit ad608c84e3
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Mon Jul 4 16:41:18 2022 +0100

    atmospherics (#18152)

commit c644fd0384
Author: Viz <107632879+Inadvizable@users.noreply.github.com>
Date:   Mon Jul 4 09:28:22 2022 +0200

    I HATE INSTANT STUNS! I HATE INSTANT STUNS! (#18196)

commit 422f40b670
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Sun Jul 3 23:28:19 2022 +0200

    Makes it so the baseturf on lavaland is lava, not space (#18193)

commit 77767b8986
Author: Viz <107632879+Inadvizable@users.noreply.github.com>
Date:   Sun Jul 3 23:12:44 2022 +0200

    Untases your slug (#18185)

commit 38c4d55204
Author: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date:   Sun Jul 3 15:51:30 2022 -0400

    Operative nuke spawns in the right place (#18199)

    * Ah yes, nukes

    * Oh that works too.

    * Update nuclear.dm

commit 9a8647194f
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Sun Jul 3 20:51:21 2022 +0100

    buckling (#18203)

commit 36130193b5
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Sun Jul 3 18:55:11 2022 +0100

    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>

commit da94f63251
Author: GDN <96800819+GDNgit@users.noreply.github.com>
Date:   Sun Jul 3 07:25:09 2022 -0500

    Nerfs telekinesis (#18177)

    * tk nerfed from .3 to 3 seconds

    * Update telekinesis.dm

    * removes those (), I didn't need em

commit bfdce2966a
Author: PacifistDalek <32213277+PacifistDalek@users.noreply.github.com>
Date:   Sun Jul 3 07:09:57 2022 -0400

    Absolute Heresy (#18182)

commit 41b231a9a0
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date:   Sun Jul 3 04:08:35 2022 -0700

    update config comments to be accurate (#18175)

commit e3b5527576
Author: moxian <moxian@users.noreply.github.com>
Date:   Sat Jul 2 22:38:01 2022 +0000

    Fix several runtimes with remote welderbombing (#18137)

commit 9a8d6da7ab
Author: Kugamo <thekugamo@gmail.com>
Date:   Sat Jul 2 12:45:24 2022 -0500

    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>

commit 8dc53fc65e
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Sat Jul 2 17:34:38 2022 +0100

    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>

commit 89ba9c047c
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Sat Jul 2 16:48:46 2022 +0100

    Code Readability - Effects (#18150)

    * effects

    * removed anchored = TRUE from objects that inherit that property within the effects folder and subfolders

commit 3c00a1f061
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Fri Jul 1 23:25:01 2022 +0100

    Removes cortical borers. No, I am not sorry. (#18161)

    * Removes cortical borers. No, I am not sorry.

    * Icon purge

commit 26bd519465
Author: Kugamo <thekugamo@gmail.com>
Date:   Fri Jul 1 17:20:42 2022 -0500

    [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>

commit f6646447f3
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Fri Jul 1 23:02:55 2022 +0100

    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>

commit d1da076958
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Fri Jul 1 21:52:12 2022 +0100

    Code Readability - Spells  (#18141)

    * 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

    * Revert "added check"

    This reverts commit 082aa40246.

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

commit 8b876914ce
Author: Marm <85680653+ItsMarmite@users.noreply.github.com>
Date:   Fri Jul 1 15:42:29 2022 +0100

    Fixes ebolas (#18168)

commit aaf1eae36c
Author: moxian <moxian@users.noreply.github.com>
Date:   Fri Jul 1 14:42:11 2022 +0000

    Fix a runtime in dna vault Initialize (#18172)

commit 66cad5fb2b
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Fri Jul 1 10:26:55 2022 +0100

    Code Readability - Door Control (#18162)

    * door_control

    * put comment back

    * comment change for autodoc

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

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

commit f18bf0f2d4
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Fri Jul 1 06:06:40 2022 +0100

    turret_control (#18165)

commit 46b5b16d21
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Thu Jun 30 22:32:34 2022 +0100

    updated holopad (#18145)

commit e9133fe658
Author: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date:   Thu Jun 30 22:32:13 2022 +0100

    toilet init (#18146)

commit 51f870595e
Author: Marm <85680653+ItsMarmite@users.noreply.github.com>
Date:   Thu Jun 30 19:00:29 2022 +0100

    Nerfs Deathnettle (#18128)

    * Nerfs Deathnettle (I hate plants)

    * Update nettle.dm

    Early returns are good apparently.

    * Stage of grief: fear

    Should fix errors?

    * Update code/modules/hydroponics/grown/nettle.dm

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

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

commit bead47ea29
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Thu Jun 30 17:57:52 2022 +0100

    Adds crawling. (#17899)

    * crawling?

    * knockdown. CONTAINS CHANGES THAT NEED REVERTING

    * plotting can_moves death

    * CANMOVE IS DEAD

    * mappers are insane

    * removes todos as the are todone

    * decreases crawling speed

    * silly-con fixes

    * surgery fixes

    * fixes death

    * pAI fixes

    * removes var/lying

    * runtime fix

    * decreases default crawling speed

    * correct crawling dir

    * some more fixes

    * stunbaton tweak, revert later

    * rejuv fix

    * restraint and incapacitated refactor

    * crawling dir in line with TG

    * fixes vehicle movement and grabs

    * alien rest fixes

    * antistun fixes

    * fixed fall sounds

    * forgor to stage this

    * first review

    * canmove zombie dispersal

    * fix

    * lots of fixes

    * defines

    * fixes the trait helper

    * if you got no legs you can still crawl

    * sillyconfix

    * no reverty keepy

    * jaunt fix

    * hopefully fixes perma sleepy zzz

    * admin rejuv temp fix

    * rest canceling

    * antistun chems now remove knockdown

    * buckle offset fix

    * fixes some stuff

    * crawling delay = 4

    * descuffs bed

    * sleeping hotfix

    * fixes simple mob resting

    * V is the macro for resting

    * projectiles no dodgy

    * refines the projectile check

    * god I hate strings

    * MORE FIXES

    * I hate buckling

    * fixes capulettium plus

    * winding down

    * farie review

    * bugs did stop showing up

    * SEAN

    * todo

    * sean review

    * ed209

    * i HATE cyborgs

    * steel review

    * laaaaaast things

    * reverts stun baton changes

    * and done

* Revert "Squashed commit of the following:"

This reverts commit 734c90351b.

* new solution!!

actually utilizes the logic in /obj/machinery/atmospherics/relaymove(mob/living/user, direction) that seemingly was written for just these scenarios (moving between pipenets)
 2022-07-09 15:07:18 +01:00
Sirryan2002GitHubAffectedArc07Farie82SteelSlayerLuc
 		f2813a6730 Complete Library Overhaul Part 1 (#17832) 
* first edits

* more commits yay

* more changes

* Update paradise.dme

* changes

* more edits

* more edits

* changes

* more changes

* changes

* more stuff

stuff

Update tgui.bundle.js

* FUCK

* Many UI changes

* Update Lib Computer UI and Correct Map Issues

* squashed commits :)

Guts Old Book/Manual Code and Reworks it
final (almost) touches

* this should pass tests now

* fixes random ruin having a removed object

* adds review suggestions

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

* squashed commits :)

update schema
adds python requested changes
implements proper python & sql scripts
applies some requested changes + minor fixes
bump SQL version to 40

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

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

* applies requested changes from code review

* lets pass some tests today

more fixes

* Apply suggestions from code review

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

* more requested changes fulfilled

* should fix map issues + a couple other things

* fixes & sanitization stuff

* Apply suggestions from code review

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

* updates UI and implements more requested changes

* mother of bug fixes & UI cleanup

* removes unused code

* Apply suggestions from code review

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

* fixes

* adds GC checks

* Apply suggestions from code review

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

* requested changes + TGUI Cleanup and Styling

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-07-09 14:55:12 +01:00
S34N 72d9783d72 tidies menu, unduplicates rest 2022-07-09 14:41:41 +01:00
moxianandGitHub 49817b4122 Remove unused file (#18295) 2022-07-09 13:17:30 +01:00
KalevTaitandGitHub 99c1adbcf2 mining (#18283) 2022-07-09 12:24:55 +01:00
roarbarkandGitHub 1bef55b078 adds in a new vulpkanin hairstyle (#18160) 
this adds the icon state and the code that puts it into the character setup
 2022-07-09 08:25:06 +02:00
Sirryan2002andGitHub a3ec899dfd logic fix (#18288) 2022-07-09 08:22:33 +02:00
S34N e933e74910 saves prefs when someone changes a keybind 2022-07-08 22:19:29 +01:00
S34N 902dc95a7a lets borgs stow modules 2022-07-08 22:01:42 +01:00
S34NandGitHub 17495c99f7 Ports icons for Vents & Scrubbers (#18117) 
* pipes and holopad

* deconflict

* return all ye crusty holopads

* le merge conflicts

* farewell ye bonny lass

* adds frames for other things too
 2022-07-08 14:51:08 -05:00
AffectedArc07andGitHub dd4506f794 Revert "Quieter radio emotes (#18103)" (#18279) 
This reverts commit e291a8c779.
 2022-07-08 14:32:29 -05:00
S34N 6edcf5ec26 and fixes admins not being able to msay 2022-07-08 19:51:24 +01:00
S34N b967692b90 makes old people happy 2022-07-08 19:47:33 +01:00
S34N 145a6d20c6 flip and spin 2022-07-08 19:01:27 +01:00
ContrabangandGitHub a09c0e5bd0 fixes a runtime caused by a custom emote and makes IsVocal() false for people with the mute trait (#18271) 
* why are they silent

* bam fixed

* oops remove those testing things
 2022-07-08 17:59:41 +01:00
LucandGitHub 59451b0c44 Fix users being able to unintentionally emote while fake dead (#18259) 2022-07-08 17:57:58 +01:00
Sirryan2002GitHubmoxian
 		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
KalevTaitandGitHub f5d19f283f Code Readability - Surgery (#18238) 
* surgery

* remove unused helper functions
 2022-07-08 09:20:37 +02:00
KalevTaitandGitHub 3bd7952ffb guns (#18237) 2022-07-08 09:18:54 +02:00
KalevTaitandGitHub 3067e4eb0f hydroponics (#18234) 2022-07-08 09:16:52 +02:00
MarmGitHubCharlie
 		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
QwertytofortyandGitHub 23ec577586 Changes weapon knock downs to knockdowns (#18212) 2022-07-07 20:25:19 +01:00
Sirryan2002GitHubCharlie
 		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
Sirryan2002GitHubFarie82moxian
 		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
QwertytofortyGitHubCharlieSteelSlayer
 		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
Bm0nandGitHub 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
KalevTaitandGitHub cf640e5195 Code Readability - Food (#18211) 
* food

* implemented requested changes
 2022-07-07 11:51:15 +01:00
AffectedArc07andGitHub 0060c3a2f3 More ebeam GC fixes (#18240) 2022-07-06 17:52:16 -04:00
S34N 11905a8d08 adds ALL the emotes 2022-07-06 22:17:48 +01:00
QwertytofortyandGitHub 47c054917e Stops explosions causing ebeams to fail GC (#18236) 2022-07-06 21:20:47 +01:00
datloGitHubAffectedArc07
 		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
S34N deb6833574 fixed asay/msay keybind 2022-07-06 20:50:26 +01:00
KalevTaitGitHubAffectedArc07
 		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
AffectedArc07andGitHub 4ca73fc3cd God damn I am dumb (#18233) 2022-07-06 20:21:24 +01:00
QwertytofortyandGitHub d3d40b79a6 Axes prescanning. (#18220) 
* Axes prescanning.

* tgui pls don't kill me
 2022-07-06 19:50:38 +01:00
VizGitHubCharlie
 		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
CharlieandGitHub 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
KalevTaitandGitHub b7dad1801d terror spiders (#18216) 2022-07-06 19:32:44 +01:00
alex-ghandGitHub 9f501213d6 Inserting the gland now mends the bones (#18224) 2022-07-06 19:32:13 +01:00
Sirryan2002andGitHub 0c80bda49d adds istype check (#18228) 2022-07-06 19:31:46 +01:00
KalevTaitandGitHub d8b3275213 hostiles (#18230) 2022-07-06 19:31:29 +01:00