cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,379 Commits 26 Branches 2 Tags
5dc90cfb6edc31c602bbbb57edbdefe6582d531a
Commit Graph

32856 Commits

Author SHA1 Message Date
Fox McCloud
5dc90cfb6e Merge pull request #11885 from TheSardele/pod-pilor-sec-armband 
Allows pod pilots to start with security armbands
 2019-08-11 16:48:04 -04:00
Fox McCloud
c3abe952ac Merge pull request #11884 from TheSardele/bee-nuzzle 
Makes bees not inject venom when nuzzling
 2019-08-11 16:47:39 -04:00
Fox McCloud
04697a6986 Merge pull request #11870 from SteelSlayer/vampthrall-tweak 
Gives vampire thralls an objective listing their master's name
 2019-08-11 16:46:07 -04:00
Fox McCloud
5fcbfe41fa Merge pull request #11841 from Crazylemon64/fix_cheaty_ghosts 
Fixes an exploit allowing ghosts to teleport their bodies
 2019-08-11 16:41:43 -04:00
Fox McCloud
fbbf9c42e0 Merge pull request #11765 from Couls/butcher-koi 
Allow koi to be butchered
 2019-08-11 16:36:58 -04:00
Fox McCloud
3634687a88 Merge pull request #11374 from Quantum-M/removeTeleBoards 
Removes telescience boards from RnD
 2019-08-11 16:28:47 -04:00
variableundefined
0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
variableundefined
a73fbf71ed Merge pull request #11698 from Kyep/rip_lavaland_attack_logs 
Hides admin attack logs involving NPCs, lavaland syndiebase, adminroom, thunderdome
 2019-08-11 16:49:54 +08:00
Kyep
977087a97e fixes merge conflict 2019-08-11 01:36:09 -07:00
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
variableundefined
673d1c9f78 Merge pull request #11611 from farie82/blindfold-craftable 
Blindfolds are now craftable from 3 cloth
 2019-08-11 15:00:34 +08:00
Fox McCloud
6c8fe1d506 Merge pull request #11864 from Markolie/portalfix 
Portal fix
 2019-08-10 23:24:58 -04:00
variableundefined
c778b16e76 Merge pull request #11970 from datlo/traitorconflictfix 
Fix conflicting traitor objectives
 2019-08-10 20:27:20 +08:00
Crazy Lemon
ae27e39dec Merge pull request #11976 from Fox-McCloud/fix-dual-swords 
Fixes Sharpening Toy Swords
 2019-08-09 17:56:48 -06: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
fdfbb8fd93 Fixes Sharpening Toy Swords 2019-08-09 16:36:04 -04:00
datlo
4420f9505a remove erroneous check 2019-08-08 10:53:02 +02:00
datlo
a408aea8f4 fix conflicting objs and double exchange docs 2019-08-08 10:30:05 +02:00
Couls
eb15b81b75 Merge remote-tracking branch 'upstream/master' into butcher-koi 2019-08-04 21:08:59 -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
variableundefined
254e45dabd Merge pull request #11938 from farie82/pinpointer-crash-fix 
Fixes the advanced pinpointer crashing the server
 2019-08-04 22:08:56 +08: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
variableundefined
59767b5807 Merge pull request #11935 from Ty-Omaha/what-the-heck-is-this-even 
Refactors disgusting if statement
 2019-07-30 21:41:02 +08:00
TheSardele
9e5fe62155 Fixes earmuffs not protecting from vampire screeches 
Fixes a bug where earmuffs wouldn't protect you from vampire screeches if you were wearing earmuffs in your right ear slot while wearing something else in your left ear slot.
 2019-07-30 00:36:45 +02:00
joep van der velden
5847c9f5c6 turf instead of the plain Z 2019-07-29 01:04:14 +02:00
joep van der velden
d139c68227 Fixes the advanced pinpointer crashing the server 2019-07-29 00:51:44 +02:00
Ty-Omaha
f019476b3d why??? 2019-07-28 17:53:17 -04: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
b8d739653b Merge pull request #11852 from Couls/diagonal-movement-runtime-fix 
Input subsystem now checks client list for nulls before running keyloop
 2019-07-19 19:03:11 -06: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
TheSardele
b58f7b3307 Allows pod pilots to start with security armbands 
Adds Security Pod Pilots to the allowed roles list for the loadout security armband.
 2019-07-18 14:21:10 +02:00
TheSardele
6d7af710b3 Makes bees not inject venom when nuzzling 
Fixes #11751
 2019-07-18 14:01:05 +02:00
SteelSlayer
d3dbbb6bb1 Update vampire_powers.dm 
changes weakness to stun
 2019-07-17 18:49:04 -04:00