Fox McCloud
|
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 |
|
variableundefined
|
0b04d71445
|
Merge pull request #11515 from Tayyyyyyy/sanitize
Sanitize all inputs
|
2019-08-11 22:09:10 +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
|
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 |
|
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
|
fdfbb8fd93
|
Fixes Sharpening Toy Swords
|
2019-08-09 16:36:04 -04:00 |
|
Ty-Omaha
|
f5134a417d
|
door remote logs
|
2019-07-28 17:49:04 -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 |
|
tayyyyyyy
|
57c700a814
|
Sanitize all inputs
|
2019-07-14 09:35:12 -07: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 |
|
variableundefined
|
e42e1af87a
|
Merge pull request #11634 from Markolie/laborstacker
Updates the prison labor point system
|
2019-07-09 18:21:58 +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
|
cee64d5c37
|
Merge remote-tracking branch 'upstream/master' into diagonal-movement
|
2019-07-08 10:13:15 -04: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
|
82a52969e2
|
Merge pull request #11525 from Citinited/rpd-radial-menu
Adds a mini-radial menu to the RPD
|
2019-07-08 17:33:46 +08:00 |
|
Couls
|
a7b4e0b9ef
|
Merge remote-tracking branch 'upstream/master' into diagonal-movement
|
2019-07-07 22:17:19 -04:00 |
|
variableundefined
|
93d9cd4e08
|
Merge pull request #11787 from JKnutson101/lattice_catwalk_fix
Fixed a bug that prevented Catwalks and Lattice from returning materials
|
2019-07-07 22:10:08 +08:00 |
|
unknown
|
8aa5bbdb9c
|
removed unnecessary == TRUE
|
2019-07-06 14:26:42 -04:00 |
|
unknown
|
25f68f2e41
|
Removed a line that prevented Catwalks and Lattice from returning materials
|
2019-07-04 16:17:32 -04:00 |
|
Couls
|
33d35eb625
|
Merge branch 'master' into diagonal-movement
|
2019-07-02 05:55:44 -04:00 |
|
unknown
|
ded7e4be67
|
fixed a bug where construction permits deleted themselves prematurely
|
2019-06-30 20:49:37 -04:00 |
|
Couls
|
e3a19841d9
|
Merge remote-tracking branch 'upstream/master' into diagonal-movement
|
2019-06-22 03:54:43 -04:00 |
|
Improvedname
|
24c2b0fd4f
|
j
|
2019-06-10 19:53:03 +02:00 |
|
Crazy Lemon
|
54257fec69
|
Merge pull request #11688 from Markolie/swarmerfix
Fix gutlunches not eating and tesla wormhole fix
|
2019-06-06 20:13:18 -07:00 |
|
Mark van Alphen
|
e0a21759fb
|
Add tribal splints
|
2019-06-07 04:06:12 +02:00 |
|
Mark van Alphen
|
bc12891f02
|
Move shuttle seat out of comfy chairs category
|
2019-06-07 03:59:45 +02:00 |
|
Mark van Alphen
|
f56854292a
|
Add shuttle chairs (and fix newlines on all maps)
|
2019-06-07 03:39:24 +02:00 |
|
Mark van Alphen
|
dd7da2140b
|
Die of Fate fixes
|
2019-06-07 02:33:08 +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
|
250ca032c4
|
Tesla wormhole fix
|
2019-06-06 17:14:34 +02:00 |
|
Crazy Lemon
|
60fa8a0658
|
Merge pull request #11664 from Markolie/swarmerfix
Lavaland fixes, Mark V
|
2019-06-05 21:06:16 -07:00 |
|
Terilia
|
b281d26ac1
|
Added Donksoft Sniper to the spawn pool
|
2019-06-04 13:33:12 +01:00 |
|
Mark van Alphen
|
950a4cb5dc
|
More portal fixes
|
2019-06-03 21:57:00 +02:00 |
|
Mark van Alphen
|
cd362d6bad
|
Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix
|
2019-06-03 21:44:01 +02:00 |
|
Mark van Alphen
|
94eb652f15
|
Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix
|
2019-06-03 17:39:23 +02:00 |
|
Couls
|
5979166f54
|
Merge remote-tracking branch 'upstream/master' into diagonal-movement
|
2019-06-02 21:59:58 -04:00 |
|
Crazy Lemon
|
1988ae34d8
|
Merge pull request #11643 from Markolie/turfs
Lavaland fixes, continued
|
2019-06-02 17:58:56 -07:00 |
|
Mark van Alphen
|
8822887784
|
Compile fix and asteroid turf placement fix
|
2019-06-03 01:21:03 +02:00 |
|
Crazy Lemon
|
d94906e19a
|
Merge pull request #11656 from Markolie/multiplier
Fixes an exploit with the sheet multiplier
|
2019-06-02 15:52:37 -07:00 |
|
Mark van Alphen
|
c6e6c6cefd
|
Even better water handling
|
2019-06-03 00:31:03 +02:00 |
|
Mark van Alphen
|
8a70f6aa65
|
Sheet multiplier exploit fix
|
2019-06-03 00:16:39 +02:00 |
|
Mark van Alphen
|
fd8a9e4909
|
Water handling improvement
|
2019-06-03 00:06:29 +02:00 |
|