cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 09:38:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
11906 Commits
Author SHA1 Message Date
SteelSlayer dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
KyepGitHubKyep
 		7b78232276 Reworks Baseball Bat (#14186) 
* Adjusts baseball bat

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-09-16 10:16:21 -04:00
SabreMLandGitHub dd326096c9 Allows toy E-Swords to reflect Laser Tag lasers (#14191) 
* Allows toy eswords to reflect laser tag lasers
 2020-09-16 10:13:32 -04:00
ppi13andGitHub 0b23e89fa5 Balances the safety override module and Fixes #14172 (#14177) 
* Change safety override tech requirement and make it only unlock weapons instead of having the same effect as emag
 2020-09-16 10:06:49 -04:00
Kyep eb464ebd24 fixes merge conflict 2020-09-16 06:54:30 -07:00
joep van der velden 0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
variableundefinedandGitHub a6d6d0591d Merge pull request #13489 from AzuleUtama/uplinkBundleTweaks 
Improves Hacker and Payday uplink bundles
 2020-09-16 09:02:54 -04:00
variableundefinedandGitHub fc7af0f5a4 Merge pull request #13883 from ppi13/patch-2 
Removes GPS from Lavaland Tendrils
 2020-09-15 20:08:19 -04:00
Kyep 07b4ff1354 merge conflict fix 2020-09-15 17:04:39 -07:00
variableundefinedandGitHub db06596ffa Merge pull request #14283 from SabreML/Fire-Lighting 
Makes cigarettes catch fire if their holder is also on fire
 2020-09-15 19:41:02 -04:00
Kyep 00b458be3e fixes merge conflict 2020-09-15 15:34:50 -07:00
joep van der velden 05824f55b7 AS MOB 2020-09-15 21:17:32 +02:00
joep van der velden 25293ab3b8 Refactor ala reviews 2020-09-15 21:16:55 +02:00
Kyep 995165ae38 fixes merge conflict 2020-09-15 11:39:00 -07:00
Kyep 995a7c66e5 Fixes AI being unable to change radio settings 2020-09-15 11:13:10 -07:00
AffectedArc07 c39e00d7fc Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14059 2020-09-15 17:16:57 +01:00
Kyep 28d915b26f fixes merge conflict 2020-09-15 08:40:03 -07:00
AffectedArc07 e12701c453 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14022 2020-09-15 16:23:11 +01:00
Kyep 4e44253af3 fixes merge conflict, updates to master 2020-09-15 00:31:56 -07:00
variableundefinedandGitHub 3a3ff1400a Merge pull request #13447 from EMPlight/BulldogXLmag 
Adds Bulldog extended drum mags and bundle for nuke ops.
 2020-09-14 16:45:04 -04:00
mochi b05eded1d8 Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 22:13:04 +02:00
variableundefinedandGitHub f5b7554c1a Merge pull request #12851 from SteelSlayer/internals-auto-push-up 
Activating internals automatically pushes breath masks into place
 2020-09-14 16:02:45 -04:00
AffectedArc07andGitHub 73acdcb221 Merge pull request #12628 from SteelSlayer/IPC-buffs 
IPC balance changes
 2020-09-14 20:59:13 +01:00
mochi e07306f20d Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 20:04:48 +02:00
SteelSlayer 6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
AffectedArc07andGitHub a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul 
Overhauls and Refactors Alarm System
 2020-09-14 13:54:06 +01:00
Kyep 933a2f4e34 lastlog, dept_demote, refactor 2020-09-12 23:42:58 -07:00
AffectedArc07andGitHub 706dc6e3c6 Merge pull request #14233 from RedWolfie/chameleon 
chameleon flag fix
 2020-09-12 23:45:09 +01:00
SabreML 3aea152a93 Fixes 
Changed 'Your' to 'The', since it's a 'visible_message'.
Also removed implied src
 2020-09-12 16:43:39 +01:00
SabreML af2ea50764 Cigarettes catch fire 2020-09-12 15:38:57 +01:00
joep van der velden 062f275b6c On tray not cyb tray 2020-09-12 10:34:31 +02:00
joep van der velden 5244b49e4e Revert the . = ..() 2020-09-12 10:28:01 +02:00
joep van der velden 33f1353126 cyborg trays drop stuff upon death. NAD disallowed 2020-09-12 10:24:12 +02:00
SteelSlayer f0fd61bb0d Merge remote-tracking branch 'upstream/master' into IPC-buffs 2020-09-10 17:20:35 -05:00
Kugamo b6ad29a1ec fixes oversight, that made some scanned objects appear solid 2020-09-08 11:42:21 -05:00
AffectedArc07andGitHub 7ee337b9e6 Merge pull request #14259 from RedWolfie/blind-weld 
Fixes some messages
 2020-09-08 12:01:23 +01:00
Certhic 77258b9b0c fixes garrote typo 2020-09-07 20:59:36 +02:00
Certhic 070904dd7b smoke bomb runtime fix 2020-09-06 12:16:05 +02:00
Certhic 720a16e7e1 replaced spawn with addtimer 2020-09-06 12:15:50 +02:00
AffectedArc07andGitHub 8197d5af7d Merge pull request #13922 from SabreML/Direction-Signs-1 
Updated Direction sign sprites.
 2020-09-06 10:47:35 +01:00
Certhic dd8740d3df chameleon flag fix 2020-09-04 13:47:16 +02:00
SabreML d33561bea9 Alt clicking now locks/unlocks lockers 2020-09-04 05:09:56 +01:00
Kugamo e0a7889e75 Adds inhand sprites, makes naming more consistant 2020-09-02 05:49:05 -05:00
AffectedArc07andGitHub 0ccf04ba23 Merge pull request #14056 from SabreML/Wood-Deconstruction 
Makes more wooden structures deconstructable.
 2020-09-02 11:05:33 +01:00
AffectedArc07andGitHub 75bbf7a6d5 Merge pull request #14088 from kugamo/Inhand-sprites-for-cigarette-packets 
Inhand sprites for cigarette packets
 2020-09-02 11:04:41 +01:00
AffectedArc07andGitHub b00304ebf1 Merge pull request #14209 from denghis1/plastic_create_cone 
Feature: Make warning cone craftable
 2020-09-02 11:00:51 +01:00
AffectedArc07andGitHub 35682a8e20 Merge pull request #14210 from RedWolfie/crayon 
[Bugfix] Orange cables
 2020-09-02 11:00:23 +01:00
Certhic 916d358ad3 replaced some magic values 2020-09-01 16:26:25 +02:00
Certhic 90ac9874b2 fixed orange crayons not making cables orange 2020-09-01 16:23:53 +02:00
denghis1 7705a8c01a Removed the crafting time of the warning cones 
Removed the crafting time of the warning cones, since it was so low anyway.
 2020-09-01 16:07:49 +02:00