cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,463 Commits 26 Branches 2 Tags
2e9b2fe7e35bdb43363d503c3614d2d3bd5611e4
Commit Graph

22177 Commits

Author SHA1 Message Date
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
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
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
AffectedArc07
455bf0b5e8 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/13888 2020-09-14 22:13:46 +01:00
variableundefined
87bb789ab1 Merge pull request #13096 from FreeStylaLT/cat_b_gone 
Removes cat ears from the autodrobe vendor and loadout
 2020-09-14 16:53:31 -04:00
variableundefined
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
AffectedArc07
73acdcb221 Merge pull request #12628 from SteelSlayer/IPC-buffs 
IPC balance changes
 2020-09-14 20:59:13 +01:00
mochi
5459e515ad Merge branch 'master' into mining-vendor-refactor 2020-09-14 20:50:42 +02:00
mochi
e07306f20d Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 20:04:48 +02:00
SteelSlayer
2a70626c78 affected review tweaks 2020-09-14 11:38:17 -05:00
AffectedArc07
23ab463cff Merge remote-tracking branch 'ParadiseSS13/master' into pr/SteelSlayer/13769 2020-09-14 15:38:17 +01:00
SteelSlayer
6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
Kyep
33b9abdc5e AA requests 2020-09-14 06:44:02 -07:00
AffectedArc07
6b4ef46aa7 Merge remote-tracking branch 'Paradise/master' into pr/Kyep/13771 2020-09-14 14:35:45 +01:00
AffectedArc07
a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul 
Overhauls and Refactors Alarm System
 2020-09-14 13:54:06 +01:00
mochi
fb9a4831db Fix replica pod cloning species with NO_SCAN 2020-09-14 11:11:31 +02:00
variableundefined
779704356e Merge pull request #13601 from SteelSlayer/borger-tweaks 
Cyborg factory tweaks/improvements.
 2020-09-13 20:43:21 -04:00
Fox McCloud
e6bd4b6638 fix ups 2020-09-13 18:33:21 -04:00
AffectedArc07
0a70b8dedd Merge pull request #14174 from ppi13/hazard-vest 
Buff the hazard vest's suit storage
 2020-09-13 13:37:54 +01:00
Kyep
d10ec78a79 is it stat == DEAD, or not? 2020-09-12 22:39:20 -07:00
AffectedArc07
787b62e7a0 Merge pull request #13807 from Fox-McCloud/xeno-disarm-rework 
Xeno Disarm Rework
 2020-09-12 23:29:03 +01:00
SteelSlayer
66307bb5b9 diona light alert 2020-09-12 10:48:56 -05: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
AffectedArc07
5de78c3f21 Merge pull request #14240 from kugamo/fix-grey-armor 
Fixes Greys' armor and secmask sprites
 2020-09-10 08:46:29 +01:00
AffectedArc07
03e2426861 Merge pull request #14245 from SabreML/Suppressor-screwing 
Adds a sound when you add/remove a Suppressor from a gun
 2020-09-10 07:51:01 +01:00
Kyep
ce24ec0742 TS gibbing %chance fix 2020-09-08 16:12:30 -07:00
Kugamo
ac558c76ff fixem PAI die 2020-09-07 07:23:31 -05:00
AffectedArc07
333c018d28 Merge pull request #14247 from farie82/dead-talk-fixes 
Makes dead chat logged in the file when you're in a body. Makes say_dead handle all the logic. Whispering while dead won't do anything now
 2020-09-06 15:15:37 +01:00
joep van der velden
141093b9a3 Dead can't whisper. Dead say code consolidation 2020-09-06 15:45:22 +02:00
AffectedArc07
ac0a9b7ba7 Merge pull request #14145 from TDSSS/armory-shuttle 
New admin shuttle template: Armory shuttle
 2020-09-06 11:13:01 +01:00
AffectedArc07
48346d2ac5 Merge pull request #14180 from SabreML/AI-languages 
Allows the AI to speak all (common) languages
 2020-09-06 11:05:27 +01:00
AffectedArc07
ea38586ef1 Merge pull request #14218 from RedWolfie/experimentor 
[Bugfix] E.X.P.E.R.I-MENTOR runtime fix
 2020-09-06 10:57:11 +01:00