Fox McCloud
|
e602e4fa30
|
Updates Food and Candy Sprites
|
2019-08-23 17:37:38 -04:00 |
|
variableundefined
|
1dc8e66cbc
|
Merge pull request #11772 from Couls/constructable-rechargers
[READY] Constructable Rechargers and machinery tweaks
|
2019-08-23 09:16:37 -04:00 |
|
variableundefined
|
e18777959e
|
Merge pull request #11818 from Couls/baseball-deflects
Baseball!
|
2019-08-23 08:05:41 -04:00 |
|
Couls
|
6d7ee9c934
|
use hit_reaction instead
|
2019-08-23 00:40:44 -04:00 |
|
Fox McCloud
|
f8c447dbba
|
Merge pull request #12023 from SteelSlayer/ghost-health-analyzer
Health and Cyborg analyzer for ghosts
|
2019-08-22 19:54:48 -04:00 |
|
Fox McCloud
|
ecec14e939
|
Merge pull request #12041 from Ionward/sprite-touchup-august19
Species Sprite Touchup and Minor Additions
|
2019-08-22 19:33:33 -04:00 |
|
Fox McCloud
|
39d0b0b3f5
|
Merge remote-tracking branch 'upstream/master' into crusher-trophies
|
2019-08-22 16:28:06 -04:00 |
|
variableundefined
|
806c00ba68
|
Merge pull request #12039 from Fox-McCloud/more-lavaland-updates
More Lavaland Updates: Primal and Bayonets
|
2019-08-21 22:38:25 -04:00 |
|
Fox McCloud
|
a8f9410b8d
|
Merge pull request #12028 from Shadow-Quill/Health-Analyzer-Toggle
Use Health Analyzers inhand to switch verbosity
|
2019-08-21 01:52:11 -04:00 |
|
Fox McCloud
|
052ee02db4
|
Merge pull request #12002 from Markolie/falsewallfix
False wall secure fix, add extra step to plating deconstruction
|
2019-08-21 01:31:21 -04:00 |
|
Ionward
|
e347ae8dfe
|
a little more than a touchup, includes: grey fit backpacks + uniforms and fixes associated, drask glasses and masks, and a version of the god eyes for drask grey and vox
|
2019-08-19 18:34:37 -07:00 |
|
Fox McCloud
|
e05e85618f
|
nah, needs a refactor
|
2019-08-19 20:15:29 -04:00 |
|
Fox McCloud
|
3667557b60
|
More Lavaland Updates: Primal and Bayonets
|
2019-08-19 20:02:53 -04:00 |
|
Shadow
|
c2015c6608
|
THE SWITCHENING
|
2019-08-18 12:47:02 -05:00 |
|
Fox McCloud
|
9699beee82
|
Ports Crusher Trophies
|
2019-08-17 21:57:40 -04:00 |
|
SteelSlayer
|
3e7156e263
|
Ghost health/cyborg analyzer
|
2019-08-17 10:00:05 -04:00 |
|
Crazy Lemon
|
3313efed23
|
Merge pull request #11981 from Fox-McCloud/lavaland-update
Major Lavaland Update
|
2019-08-16 22:22:49 -06:00 |
|
Fox McCloud
|
e2f7f6f055
|
science radio
|
2019-08-16 23:58:27 -04:00 |
|
variableundefined
|
adc33ef3a0
|
Merge pull request #11783 from Couls/on-hit-effects
[READY] Add on-hit effects for lasers and bullet holes for walls from TG
|
2019-08-16 07:50:49 +08:00 |
|
variableundefined
|
f82adc1310
|
Merge pull request #11937 from farie82/Borgs-crate-rig-fix
Rigging a crate now costs 15 coils instead of deleting your stack
|
2019-08-16 00:33:20 +08:00 |
|
farie82
|
00d7eb7c3f
|
Update crates.dm
|
2019-08-15 18:16:50 +02:00 |
|
variableundefined
|
34bb102a37
|
Merge pull request #11767 from Arkatos1/pillbottle
New Medical Directive - Colored Pillbottles!
|
2019-08-15 11:17:46 +08:00 |
|
variableundefined
|
9945c04f96
|
Merge pull request #11833 from dovydas12345/Chair
Fixes being able to pick up chairs with full hands or without hands.
|
2019-08-14 23:47:12 +08:00 |
|
Mark van Alphen
|
df2df63b5f
|
False wall secure fix, add extra step to plating deconstruction
|
2019-08-14 04:13:47 +02:00 |
|
Couls
|
7c5bdcc83c
|
Merge remote-tracking branch 'upstream/master' into unrestricted-airlocks
|
2019-08-13 21:46:32 -04:00 |
|
variableundefined
|
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 |
|
Arkatos1
|
bddc7132c2
|
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
|
2019-08-12 16:36:43 +02:00 |
|
variableundefined
|
f6505a6fd5
|
Merge pull request #11819 from Kyep/medals
Department Medals
|
2019-08-12 17:52:22 +08:00 |
|
variableundefined
|
2b53fb0ab3
|
Merge pull request #11392 from Citinited/airlock-spawners
Airlock spawners 2: Electric Boogaloo
|
2019-08-12 13:30:26 +08:00 |
|
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 |
|
Fox McCloud
|
ee0447dad6
|
Major Lavaland Update
|
2019-08-10 22:36:55 -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 |
|
farie82
|
b4ed42155b
|
return
|
2019-08-07 08:43:32 +02:00 |
|
Couls
|
70c9c4c932
|
Merge remote-tracking branch 'upstream/master' into baseball-deflects
|
2019-08-04 21:19:38 -04:00 |
|
Couls
|
268881de5c
|
Merge remote-tracking branch 'upstream/master' into constructable-rechargers
|
2019-08-04 21:11:21 -04:00 |
|
Couls
|
75ed8566f5
|
Merge remote-tracking branch 'upstream/master' into on-hit-effects
|
2019-08-04 21:00:57 -04:00 |
|
joep van der velden
|
b46e970327
|
Better fix now. Use 15 wires using use()
|
2019-07-29 00:31:22 +02:00 |
|
joep van der velden
|
2bddeb7fde
|
Borgs can't rig crates anymore with cable coil
|
2019-07-29 00:08:35 +02:00 |
|
Ty-Omaha
|
f5134a417d
|
door remote logs
|
2019-07-28 17:49:04 -04:00 |
|
Couls
|
5427c5267c
|
Merge branch 'master' into unrestricted-airlocks
|
2019-07-15 18:29:31 -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 |
|