cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,622 Commits 26 Branches 2 Tags
90fd9a8fb8d72236ec0df6d61bf076d0a98b2bee
Commit Graph

22240 Commits

Author SHA1 Message Date
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969) 
Removes all relative heresy
 2020-09-16 12:52:20 -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
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
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
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
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
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
0a79d49b56 Merge pull request #14301 from SabreML/Fluffy-change 
Pineapple Salad fluff sprite change
 2020-09-16 13:54:19 +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
variableundefined
1d5358f79b Merge pull request #14215 from AffectedArc07/removes-omni-atmos 
Removes omni gas devices
 2020-09-15 22:27:42 -04: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
19eba6b06d Merge pull request #14178 from SabreML/Borg-tweaks-1 
A couple of Cyborg tweaks
 2020-09-15 19:53:51 -04:00
variableundefined
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
variableundefined
b2cd812d04 Merge pull request #14289 from Dovixx/SSD-portal 
Makes the list SSDs and AFKs panel spawn the NT SSD teleportation portal
 2020-09-15 19:37:24 -04:00
variableundefined
1276fb4402 Merge pull request #14285 from Sinestia/master 
Turn off xenobiology camera acceleration
 2020-09-15 19:36:51 -04:00
AffectedArc07
e02917f69f Merge remote-tracking branch 'ParadiseSS13/master' into pr/RedWolfie/14258 2020-09-15 22:04:01 +01:00
AffectedArc07
00c09f7f34 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14225 2020-09-15 21:13:03 +01:00
AffectedArc07
d587b05d02 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14200 2020-09-15 21:00:07 +01:00
AffectedArc07
2e29a1ddcb Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14190 2020-09-15 20:46:10 +01:00
AffectedArc07
848bfee01b Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14176 2020-09-15 20:36:24 +01:00
AffectedArc07
0c33f1a511 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14166 2020-09-15 20:24:29 +01:00
AffectedArc07
9470e34aed Merge remote-tracking branch 'ParadiseSS13/master' into pr/TDSSS/14101 2020-09-15 20:01:16 +01:00
Kyep
d65379a47d fixes merge conflict 2020-09-15 10:49:27 -07:00
TDSSS
edd038999c Comment on ferry console 2020-09-15 19:16:00 +02:00
AffectedArc07
bc3c5258a0 Merge remote-tracking branch 'ParadiseSS13/master' into pr/TDSSS/14065 2020-09-15 17:33:08 +01:00
Kyep
4ddb9818f3 fixes merge conflict 2020-09-15 08:59:18 -07:00
AffectedArc07
2219c31485 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14058 2020-09-15 16:57:35 +01:00
Kyep
222d17c01f fixes merge conflict 2020-09-15 08:56:35 -07:00
Kyep
b9e0ca1359 fixes merge conflict 2020-09-15 08:54:10 -07:00
Kyep
28d915b26f fixes merge conflict 2020-09-15 08:40:03 -07:00
SabreML
e0396d99f8 Merge branch 'master' into Borg-tweaks-1 2020-09-15 16:25:12 +01:00
AffectedArc07
d5157b3ab6 Merge pull request #13738 from dearmochi/tgui-medical 
[TGUI] Medical Machines
 2020-09-15 15:19:39 +01:00
AffectedArc07
76951ca13e Merge pull request #14268 from Kyep/ts_gib_fix 
Fixes incorrect TS gibbing
 2020-09-15 14:52:49 +01:00
mochi
d8f949b434 Merge branch 'master' into tgui-medical 2020-09-15 12:46:30 +02:00
Marginalorb
34cb9276ef Fix robot.dm typo 2020-09-15 01:14:25 -04:00
variableundefined
2ff1c9845d Merge pull request #13955 from AffectedArc07/sm-monitoring-console 
[TGUI] Supermatter Monitoring Console
 2020-09-14 20:41:02 -04:00
variableundefined
e9e634bb20 Merge pull request #14239 from AffectedArc07/singulo-warning-tweaks 
Improvements to singulo logging
 2020-09-14 20:40:46 -04:00
AffectedArc07
5367a8c9a9 Merge remote-tracking branch 'ParadiseSS13/master' into sm-monitoring-console 2020-09-14 22:34:09 +01:00