cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-21 23:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,658 Commits 28 Branches 2 Tags
71e7306706fcfa3ed743eba2a95bdf5bf2cbdff0
Commit Graph

36034 Commits

Author SHA1 Message Date
Shadow-Quill
71e7306706 Change 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-09-16 15:01:12 -05:00
Shadow Quill
82b0a4b2f5 Request 2020-09-16 14:34:33 -05:00
Shadow Quill
bd1d83f27d Auto stash before revert of "Merge pull request #14289 from Dovixx/SSD-portal" 2020-09-16 14:17:04 -05:00
AffectedArc07
317eb76485 Removes immersion breaking text to speech (#14251) 2020-09-16 15:15:07 -04:00
AffectedArc07
c5597b9372 Merge pull request #14291 from Kyep/tgui_id_computer 
[TGUI] ID Computer
 2020-09-16 20:10:42 +01:00
SteelSlayer
cee8a464df Makes mindslaves appear on the round end antagonist listing (#14224) 
* traitor score screen

* includes slaved by text

* line break

* update size of mindslave text to match traitor
 2020-09-16 15:02:48 -04:00
AzuleUtama
52eaaf5003 Reworks minor addictions for all addiction stages (#14297) 2020-09-16 14:40:04 -04:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969) 
Removes all relative heresy
 2020-09-16 12:52:20 -04:00
Kyep
b7948898bc allow cap/hop (but NOT heads) to terminate any ID on a dept console 2020-09-16 09:15:06 -07:00
variableundefined
185b5c4a08 Merge pull request #13994 from Bizzonium/tweakMechaTeleportation 
Fix and tweak teleportation for mecha
 2020-09-16 12:14:34 -04:00
variableundefined
c280d4b3b9 Merge pull request #14220 from Qwertytoforty/No-you-can-not-kill-blobs-and-take-5% 
Makes protector guardians only do 6 object damage in shield mode
 2020-09-16 12:05:24 -04:00
variableundefined
2c6c9d495e Merge pull request #14329 from Cocacolagua/grinds-my-gears 
Adds periods to some emotes
 2020-09-16 11:50:13 -04:00
variableundefined
d9a8da98bb Merge pull request #14028 from SteelSlayer/spawn-removal 
Some spawn removals and other assorted code cleanup
 2020-09-16 11:47:59 -04:00
variableundefined
bda9114547 Bandaids the parallax runtime (#13974) 2020-09-16 11:35:17 -04:00
AffectedArc07
cafe92f93b Fixes duct tape exploit (#13985) 
* Fixes duct tape exploit
 2020-09-16 11:34:18 -04:00
Kyep
5d2363949f Fixes & Reworks Rogue Combat Drone Event (#14040) 
* combat drone rework
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-09-16 11:25:34 -04:00
Kyep
a3787383f5 notify dept target, refactor / consistent buzz sounds, improved logging 2020-09-16 08:22:58 -07:00
Cocacolagua
64beb81db1 emotes to standard 2020-09-16 12:18:06 -03:00
Cocacolagua
cf279cdcfa Detective Revolver Nerf (#14219) 
* det revolver nerf
 2020-09-16 10:54:55 -04:00
SteelSlayer
72f80091bc fix after upstream merge 2020-09-16 09:38:57 -05:00
Kugamo
55fcdbc503 Adds PDA lamps and in-PDA ID sprites (#14032) 
* Adds sprite for PDAlight, references it, and alters PDA sprites to add off bulbs & redoes all the ID-in-pda sprites, and reorganizes the dmi.
 2020-09-16 10:38:49 -04:00
SteelSlayer
dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
Kyep
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
SabreML
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
ppi13
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
Aurorablade
868de60837 Adds some basic say logging to the wicker doll (#14199) 
* Adds some basic say logging to the wicker doll
 2020-09-16 10:02:04 -04:00
SabreML
b9b163aefb Allows Shadowlings to disable 'Light Floor' tiles (#14316) 
* Sling can disable floorlights
 2020-09-16 09:58:58 -04:00
RedWolfie
f86a64a3a1 made emagged drones obey their death timer (#14287) 
* made emagged drones obey their death timer
 2020-09-16 09:56:34 -04:00
Kyep
eb464ebd24 fixes merge conflict 2020-09-16 06:54:30 -07:00
Kyep
cd6af87b88 AA requests 2020-09-16 06:53:30 -07:00
denghis1
845e7a8b75 Added the warning cone as a headpiece for Ian (#14216) 
* Added the warning cone as a headpiece for Ian
 2020-09-16 09:52:40 -04:00
Lumi
08e92ee6a7 Adds pancakes. (#14130) 
* Pancakes

Adds pancakes, berry pancakes and choc-chip pancakes.
 2020-09-16 09:41:42 -04: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
AffectedArc07
3c02589f92 Merge pull request #14248 from SteelSlayer/SScleanup 
Adds a new subsystem: SScleanup
 2020-09-16 14:21:28 +01:00
SteelSlayer
860b2c0077 Merge remote-tracking branch 'upstream/master' into SScleanup 2020-09-16 08:11:13 -05:00
variableundefined
a6d6d0591d Merge pull request #13489 from AzuleUtama/uplinkBundleTweaks 
Improves Hacker and Payday uplink bundles
 2020-09-16 09:02:54 -04:00
AffectedArc07
0a79d49b56 Merge pull request #14301 from SabreML/Fluffy-change 
Pineapple Salad fluff sprite change
 2020-09-16 13:54:19 +01:00
AffectedArc07
1d59e4944b Merge remote-tracking branch 'ParadiseSS13/master' into pr/SteelSlayer/14320 2020-09-16 13:07:11 +01:00
mochi
84982acdf2 Add missing tab?? 2020-09-16 13:25:54 +02:00
mochi
4a364fcbfb Clear null chords from music to fix runtime 2020-09-16 13:12:17 +02:00
mochi
ceb427fd64 Fix synthesized music's last note cutting short 2020-09-16 13:11:41 +02:00
mochi
8e4784579e Fix music transcending Z-levels 2020-09-16 13:09:54 +02:00
AffectedArc07
efd5584cde Merge remote-tracking branch 'Paradise/master' into pr/RedWolfie/14277 2020-09-16 10:52:46 +01:00
variableundefined
1d5358f79b Merge pull request #14215 from AffectedArc07/removes-omni-atmos 
Removes omni gas devices
 2020-09-15 22:27:42 -04:00
SteelSlayer
a466c1e682 forgot some stuff 2020-09-15 20:46:03 -05:00
SteelSlayer
98a77af506 Merge remote-tracking branch 'upstream/master' into tgui-filter 2020-09-15 20:25:24 -05:00
SteelSlayer
aafd9ca27a tgui filters 2020-09-15 20:19:03 -05:00
variableundefined
ac1d7478fd Merge pull request #14211 from Qwertytoforty/ACKCHYUALLY 
Corrects the description of Stimulants and Stimulative Agent
 2020-09-15 21:01:01 -04:00
variableundefined
2ca98f2267 Merge pull request #14217 from Kyep/crabwalking 
Crabwalking now causes slowdown similar to walk speed
 2020-09-15 21:00:11 -04:00
variableundefined
fc7af0f5a4 Merge pull request #13883 from ppi13/patch-2 
Removes GPS from Lavaland Tendrils
 2020-09-15 20:08:19 -04:00