cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,484 Commits 15 Branches 2 Tags
9097eb0e1d4bb96e85ccf9aecf63b7176df07c52
Commit Graph
17225 Commits
Author SHA1 Message Date
variableundefinedandGitHub 9097eb0e1d Merge pull request #11741 from AzuleUtama/chameleonGlasses 
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
 2019-08-13 12:06:39 +08:00
variableundefinedandGitHub 71a5314d2f Merge pull request #11792 from iantine/mousesuicide 
Allows player controlled mice to suicide
 2019-08-12 17:53:42 +08:00
variableundefinedandGitHub f6505a6fd5 Merge pull request #11819 from Kyep/medals 
Department Medals
 2019-08-12 17:52:22 +08:00
variableundefinedandGitHub 98b821c120 Merge pull request #11637 from datlo/lavalandgolemsintospace 
Move free golems to lavaland, let them move shuttle still
 2019-08-12 17:42:40 +08:00
variableundefinedandGitHub d59b09c382 Merge pull request #11539 from farie82/Fix-weird-identity-issues 
Fixes weird identity problems
 2019-08-12 14:54:26 +08:00
variableundefinedandGitHub 2b53fb0ab3 Merge pull request #11392 from Citinited/airlock-spawners 
Airlock spawners 2: Electric Boogaloo
 2019-08-12 13:30:26 +08:00
Fox McCloudandGitHub 5b43b9b836 Merge pull request #11934 from Ty-Omaha/remote-finger 
Adds hidden fingerprint to remote door uses
 2019-08-11 17:09:46 -04:00
Fox McCloudandGitHub 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
datloandGitHub d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
variableundefinedandGitHub 0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
Kyep 977087a97e fixes merge conflict 2019-08-11 01:36:09 -07:00
variableundefinedandGitHub 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
variableundefinedandGitHub ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
variableundefinedandGitHub 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 McCloudandGitHub 6c8fe1d506 Merge pull request #11864 from Markolie/portalfix 
Portal fix
 2019-08-10 23:24:58 -04:00
variableundefinedandGitHub c778b16e76 Merge pull request #11970 from datlo/traitorconflictfix 
Fix conflicting traitor objectives
 2019-08-10 20:27:20 +08:00
Crazy LemonandGitHub 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 McCloudandGitHub 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 McCloudandGitHub 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
variableundefinedandGitHub 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
variableundefinedandGitHub 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 f5134a417d door remote logs 2019-07-28 17:49:04 -04:00
SteelSlayer d3dbbb6bb1 Update vampire_powers.dm 
changes weakness to stun
 2019-07-17 18:49:04 -04:00
SteelSlayer 0a5e273708 adds a short stun after the thralling 2019-07-16 23:08:50 -04:00
SteelSlayer 3b8384aa6c Update vampire_powers.dm 
Made the targets enthrall message in the chat a bit bigger.
Made it so the thrall gets an objective in their notes indicating who their master is
 2019-07-16 16:48:37 -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
Lumi 173fbd2470 Updates mouse suicide code 
Fixing stat  == DEAD and suiciding = TRUE, tested to work, thanks Couls!!
 2019-07-15 09:53:12 +10:00
tayyyyyyy 57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
farie82andGitHub 4cfe0c8152 Merge branch 'master' into AFK-subsystem 2019-07-12 16:42:02 +02:00
variableundefinedandGitHub 96cd20430b Merge pull request #11687 from Kyep/you_have_time 
Public Time & Security
 2019-07-12 18:20:34 +08:00
variableundefinedandGitHub 52ae3bb933 Merge pull request #11674 from DoctorDrugs/Additional-Miners 
Adds additional roundstart miner slots
 2019-07-12 18:16:32 +08:00
variableundefinedandGitHub 36736277a1 Merge pull request #11358 from Couls/diagonal-movement 
[Ready for Testmerge] Implement Diagonal Movement
 2019-07-12 17:12:57 +08:00
Couls 147f740c49 Improve diagonal pulling 2019-07-11 14:56:48 -04:00
Kyep fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Couls 197192789e Derp 2019-07-09 18:59:23 -04:00
Couls f6f61bf91b grammar 2019-07-09 18:53:05 -04:00
Couls 7c98437892 send message to the right person 2019-07-09 18:09:21 -04:00
Couls 880bddecb6 Add a notice as to why monkeys don't give blood 2019-07-09 17:57:12 -04:00
Couls 3caa97e4f9 add comments for future contributors 2019-07-09 17:48:23 -04:00