cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 13:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,356 Commits 26 Branches 2 Tags
fbbf9c42e011d170669dbf40bf33e810d3f7fd56
Commit Graph

9462 Commits

Author SHA1 Message Date
Fox McCloud
fbbf9c42e0 Merge pull request #11765 from Couls/butcher-koi 
Allow koi to be butchered
 2019-08-11 16:36:58 -04:00
variableundefined
0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
variableundefined
ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08: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
3bd3e96eaa Merge pull request #11695 from Markolie/ruinsport 
Port over remaining Lavaland ruins
 2019-08-09 17:08:38 -04: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
KasparoVy
d8a2a2f694 Guts Dynamic Alpha Adjustment 
Pending further discussion and adjustment due in another PR.
 2019-07-31 17:42:52 -04: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
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
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
tayyyyyyy
57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
Alffd
b015449865 Big hostile cats, should be able to see in the dark. 2019-07-13 22:46:24 -04:00
variableundefined
96cd20430b Merge pull request #11687 from Kyep/you_have_time 
Public Time & Security
 2019-07-12 18:20:34 +08: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
Couls
147f740c49 Improve diagonal pulling 2019-07-11 14:56:48 -04:00
Couls
e16b495170 More testmerge fixes and improvements 
Shift middle click locks your direction again
Spacepods now move again(literally one letter fixed this)
Holster hotkey is back!(H to holster and unholster)
Hotkey Toggle button has been removed from the bottom bar and verbs
 2019-07-09 07:59:12 -04:00
variableundefined
8dcccf220a Merge pull request #11125 from Quantum-M/editVampireMuzzle 
Vampire edits
 2019-07-09 18:15:42 +08:00
Mark van Alphen
d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-08 19:36:30 +02:00
Couls
4a832c4f61 Fix testmerge issues 2019-07-08 11:20:25 -04:00
Couls
cee64d5c37 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-08 10:13:15 -04:00
variableundefined
fb15166fda Merge pull request #11570 from Tayyyyyyy/autocomplete 
Autocomplete input
 2019-07-08 20:21:22 +08:00
variableundefined
742bc62c8b Merge pull request #11544 from Arkatos1/recharger 
Rechargers now show their contents and charge status on examine
 2019-07-08 20:18:36 +08:00
variableundefined
ac011e37d7 Merge pull request #11519 from Arkatos1/doll 
Clicking on a health doll icon will now check you for injuries
 2019-07-08 17:32:50 +08:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined
df199a651d Merge pull request #11663 from Markolie/maskofnarsie 
Remove traces of the Mask of Nar'Sie
 2019-07-07 22:10:02 +08:00
variableundefined
c2bd18e4fd Merge pull request #11639 from datlo/antagexploitfix 
Fix an antag rolling exploit
 2019-07-07 20:27:59 +08:00
Couls
33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
Couls
411a6ecec7 some more tweaks 2019-07-01 03:04:24 -04:00
Citinited
96a565a773 Dead or incapacitated mobs may no longer write anything in blood; write in blood bugfix 2019-06-30 21:42:51 +01:00
variableundefined
497601245f Merge pull request #11496 from Markolie/cultthings 
Gives the night vision spell to cult constructs
 2019-06-30 14:35:32 +08:00
Couls
90b74f6bfb Let's not give them poisonous meat 2019-06-30 01:56:29 -04:00
Couls
de4d0f6200 allow koi to be butchered 2019-06-30 01:49:49 -04:00
variableundefined
b8f255e899 Merge pull request #11724 from Kyep/no_more_deadly_nuzzling 
Terror Spider Intent Fix
 2019-06-28 21:00:54 +08:00
variableundefined
3bedd8c5b6 Merge pull request #11610 from Arkatos1/booicon 
New Boo! spell icon
 2019-06-24 20:52:44 +08:00
variableundefined
e01efbeb01 Merge pull request #11586 from iantine/Warble 
Adds 'warble' emote for Skrell
 2019-06-24 18:31:50 +08:00
Couls
e3a19841d9 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-22 03:54:43 -04:00
B.A.L
78f7d996ce Fixes some issues 2019-06-14 19:55:46 -07:00
Kyep
8b0d4146de TS intent fix 2019-06-14 00:57:48 -07:00
B.A.L
f71d1ef1f0 More work 2019-06-13 18:02:58 -07:00
Mark van Alphen
fea2b2532d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cultthings 
# Conflicts:
#	paradise.dme
 2019-06-09 23:28:41 +02:00
Mark van Alphen
f7c96702f2 Fix exclamation point 2019-06-07 04:13:53 +02:00
Mark van Alphen
d02165e0f9 Ruin fixes 2019-06-07 02:03:19 +02:00
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen
5110112c58 Fix honkbot construction 2019-06-06 18:57:17 +02:00
Mark van Alphen
cbce925372 Fix gutlunches not eating 2019-06-06 06:49:08 +02:00