cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 01:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,340 Commits 26 Branches 2 Tags
b3b29b40be989d6fe8da99ea10e3dbc3c56e8ec9
Commit Graph

20311 Commits

Author SHA1 Message Date
variableundefined
b3b29b40be Merge pull request #11666 from CornMyCob/cursed-heart-fix 
cursed heart fix
 2019-08-11 16:34:15 +08:00
variableundefined
9eff8a8663 Merge pull request #11696 from Markolie/shuttlechairs 
Add shuttle chairs (and fix newlines on all maps)
 2019-08-11 16:32:14 +08:00
variableundefined
ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
variableundefined
d5ba74c1ba Merge pull request #11612 from farie82/viro-clear-and-eject 
The Empty beaker button from the pandemic now also ejects
 2019-08-11 15:01:25 +08:00
Mark van Alphen
2ae1fc7ac2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs 
# Conflicts:
#	icons/obj/chairs.dmi
 2019-08-09 23:41:07 +02:00
Mark van Alphen
14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
 2019-08-09 23:38:49 +02:00
Fox McCloud
f1899f0050 Merge pull request #11697 from Markolie/tribalhealing 
Add tribal splints, ash walker tweaks and Lavaland tweaks
 2019-08-09 17:22:22 -04:00
Fox McCloud
3bd3e96eaa Merge pull request #11695 from Markolie/ruinsport 
Port over remaining Lavaland ruins
 2019-08-09 17:08:38 -04:00
Fox McCloud
41560d6e99 Merge pull request #11484 from KasparoVy/double_down 
Re-add The Ability to Natively See in the Dark
 2019-08-04 18:47:08 -04:00
KasparoVy
d8a2a2f694 Guts Dynamic Alpha Adjustment 
Pending further discussion and adjustment due in another PR.
 2019-07-31 17:42:52 -04:00
variableundefined
60cb08a471 Merge pull request #11872 from Couls/AZERTY-cyborg-fix 
AZERTY keybind hotfix
 2019-07-30 23:13:32 +08:00
variableundefined
003051e366 Merge pull request #11886 from TheSardele/signal-fix 
When using the signal emote, you now need to raise at least 1 finger
 2019-07-30 23:13:02 +08:00
variableundefined
da27e3d506 Merge pull request #11873 from SteelSlayer/robot-control-fix 
Fixes the AI's robot control window being blank
 2019-07-30 22:52:57 +08:00
Ty-Omaha
c67a98a50e fixes notes 2019-07-28 13:10:27 -04:00
Crazy Lemon
1969ce8d13 Merge pull request #11851 from Allfd/panther 
Big hostile cats, should be able to see in the dark.
 2019-07-25 17:57:34 -06:00
Couls
1680aa2c21 Fix typing indicators not showing 2019-07-25 04:37:24 -04:00
Crazy Lemon
8c531c4ac2 Merge pull request #11856 from Markolie/fix321 
Beaker fixes
 2019-07-20 18:54:18 -06:00
Mark van Alphen
4d8adb4f44 Fix reverse beaker logs 2019-07-21 02:03:02 +02:00
Mark van Alphen
02d0d44ebe Processing fix 2019-07-20 18:53:05 +02:00
variableundefined
ab3e2ca1a8 Merge pull request #11732 from farie82/AFK-subsystem 
Adds the AFK auto cryo removal system (preference setting for players)
 2019-07-20 21:28:52 +08:00
Crazy Lemon
711cf5c6b4 Merge pull request #11861 from Couls/SQL-fixes 
Fix preferences not saving
 2019-07-18 22:18:44 -06:00
Crazy Lemon
644b957a88 Merge pull request #11836 from TheSardele/bottle-throwforce 
Lowers throwforce of drinking cartons
 2019-07-18 22:16:57 -06:00
TheSardele
35552fdc8c When using the signal emote, you now need to raise at least 1 finger 
It is no longer possible to raise zero to -infinity fingers using the *signal emote.
 2019-07-18 16:53:08 +02:00
SteelSlayer
10d3a0e4b6 Update ai.dm 2019-07-16 22:03:03 -04:00
Couls
2a927f4684 Update bindings_robot.dm 2019-07-16 19:41:32 -04:00
Crazy Lemon
0019ebc5f2 Merge pull request #11825 from Ty-Omaha/permaban 
Replaces "This is a permanent ban" with "This ban does not expire automatically and must be appealed."
 2019-07-15 19:18:49 -06:00
Couls
d83547caf6 remove pointless +1 and use ceiling again 2019-07-15 20:49:41 -04:00
Couls
4eb2af193d use round instead 2019-07-15 20:47:40 -04:00
Couls
10a2915c59 Include crazy's calculation for number of sigfigs 2019-07-15 20:34:26 -04:00
Couls
c30d6171ff resupport old hotkey mode 2019-07-15 20:08:49 -04:00
Mark van Alphen
8c8950bf07 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-07-15 20:37:44 +02:00
Mark van Alphen
88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-15 20:30:54 +02:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Couls
192949375a Fix preferences not saving 2019-07-15 05:16:19 -04:00
Mark van Alphen
451c68ee0c Beaker drink fix 2019-07-14 21:54:38 +02:00
Alffd
b015449865 Big hostile cats, should be able to see in the dark. 2019-07-13 22:46:24 -04:00
variableundefined
04e3110f8d Merge pull request #11829 from Couls/diagonal-movement-misc-fixes 
Diagonal Movement tweaks
 2019-07-13 12:24:11 +08:00
Couls
e8352f576b QoL adjustments 
F2 F3 F4 buttons have been restored
when numpad targetting is off you can use numpad 1-4 to change intents
pressing shift before any of the intent buttons doesn't change intents(for people with shift+1-4 macros)
backspace now sets the focus to the chat bar
 2019-07-12 18:09:37 -04:00
TheSardele
3fc5db1bca Carton throwforce lowered 
Lowers the throwforce of drinking cartons from the bottle default of 15 to 0.
 2019-07-12 18:07:23 +02:00
farie82
4cfe0c8152 Merge branch 'master' into AFK-subsystem 2019-07-12 16:42:02 +02:00
variableundefined
96cd20430b Merge pull request #11687 from Kyep/you_have_time 
Public Time & Security
 2019-07-12 18:20:34 +08:00
variableundefined
5c325d33fe Merge pull request #11684 from IAmBigCoat/medbeamwarnings 
Added warnings to the medbeam gun re: stream-crossing
 2019-07-12 18:17:07 +08:00
variableundefined
318e115280 Merge pull request #11653 from Couls/bone-rework 
Bones nerf
 2019-07-12 18:15:17 +08:00
Couls
de5defa936 Diagonal tweaks 2019-07-12 06:00:19 -04:00
variableundefined
36736277a1 Merge pull request #11358 from Couls/diagonal-movement 
[Ready for Testmerge] Implement Diagonal Movement
 2019-07-12 17:12:57 +08:00
Ty-Omaha
dd1a48e947 this stupid space who even made appealmessage have a space in it 2019-07-11 19:03:01 -04:00
Ty-Omaha
eb3f70684d reword the reword 2019-07-11 18:42:03 -04:00
Ty-Omaha
73a7bff8b3 Permaban 2019-07-11 16:58:02 -04:00
Couls
147f740c49 Improve diagonal pulling 2019-07-11 14:56:48 -04:00
Couls
7886366d87 Update disease_outbreak.dm 2019-07-11 02:36:30 -04:00