Commit Graph

9380 Commits

Author SHA1 Message Date
Fox McCloud
f761acb2ff Merge pull request #11318 from AffectedArc07/die-master-controller
Kills off the master controller
2019-04-21 15:44:54 -04:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen
0128de1fa6 Make observers use the actual ghost layer so they appear above mineral turfs 2019-04-20 21:09:57 +02:00
CthulhuOnIce
bb7582149b these should be continues 2019-04-19 20:43:32 -05:00
Mark van Alphen
c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Arkatos1
918bee37d3 Adds deathsound for Silicons 2019-04-19 22:04:33 +02:00
Arkatos1
b0182639b2 Adds an option to grant Martial Arts via Var menu 2019-04-19 16:54:59 +02:00
Mark van Alphen
09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
2019-04-18 03:15:52 +02:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops
Nuke Ops updates and buffs
2019-04-18 07:16:31 +08:00
Mark van Alphen
6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
2019-04-17 22:46:43 +02:00
Arkatos1
e265abc568 Adds old toolbox version, fixes bugs, finishing touches 2019-04-17 21:57:46 +02:00
Arkatos1
aa82321e2a Sanity checks 2019-04-17 20:20:33 +02:00
Arkatos1
e695875756 Code improvement 2019-04-17 20:04:05 +02:00
Arkatos1
3c4bccff18 Adds Floorbot color variants, minor refactors 2019-04-17 19:56:29 +02:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
joep van der velden
0fc58330cd Fixes species transformations not retaining items correctly 2019-04-17 12:57:32 +02:00
KasparoVy
489b10d47f Runtime resolved 2019-04-16 19:43:56 -04:00
Kyep
98d3e310b4 reduces portal effect from 10s to 4s 2019-04-16 15:53:40 -07:00
variableundefined
0bc6859d7e Merge pull request #11305 from Fox-McCloud/its-time
It's Time
2019-04-16 19:48:20 +08:00
variableundefined
ff9de147e1 Merge pull request #11287 from Fox-McCloud/fix-goats
Fixes and Updates Goats
2019-04-16 19:48:04 +08:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor
Refactors Electrocution
2019-04-16 19:47:42 +08:00
variableundefined
e8b506be9b Merge pull request #11304 from Markolie/claws
Remove infinite claw sharpening with whetstones
2019-04-16 19:42:08 +08:00
Fox McCloud
3ff16da2e2 Merge pull request #11301 from KasparoVy/vox-undergarments
Adds Striped Normal-height Socks & All the Undergarments for Vox
2019-04-15 11:44:34 -04:00
Kyep
d8d8a641d3 adds portal effect, neca request 2019-04-14 20:14:44 -07:00
Fox McCloud
7f00f8313a It's Time 2019-04-14 18:24:48 -04:00
Mark van Alphen
a9fa2f32e1 Remove infinite claw sharpening 2019-04-15 00:01:08 +02:00
Mark van Alphen
e09956cc17 Dwarf legion fix 2019-04-14 22:31:25 +02:00
Mark van Alphen
2f38e94e77 Fix hivelord neck equipping 2019-04-14 22:12:34 +02:00
KasparoVy
923614a475 Codes in the Undergarments, Final Sprite Tweaks & Armalis Fix
Removes the old Vox undergarments
Adds species_fitting of undergarments (making all the Vox versions usable) to update_icons and character setup preview
Disables undergarments for Armalis
Fixes & adjusts some Vox undergarment sprites based on testing results.
Removes flesh from shredded Vox uniform sprites.
2019-04-13 22:00:13 -04:00
Kyep
77992d9292 ignore offstation, fast despawn for perma/solitary/brigcells 2019-04-13 14:30:19 -07:00
Arkatos1
5ef674f4db Code improvement, for real this time 2019-04-13 23:20:58 +02:00
Arkatos1
424432d3c0 Code improvement 2019-04-13 23:15:45 +02:00
Arkatos1
065ebeff30 Adds Ghost HUD and refactors some ghost verbs 2019-04-13 22:56:09 +02:00
joep van der velden
9166de2a3d puke update 2019-04-13 10:56:30 +02:00
Kyep
4113b23985 ssd cryo timer option 2019-04-12 14:56:18 -07:00
joep van der velden
55282f15d6 less puke related lag 2019-04-12 22:58:11 +02:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen
246d2099ae Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/__DEFINES/misc.dm
2019-04-12 19:44:31 +02:00
variableundefined
19a26909dc Merge pull request #11279 from Arkatos1/Orbit
Ghosts now orbit around their followed targets
2019-04-11 20:41:37 +08:00
Fox McCloud
cf880bd40b Fixes and Updates Goats 2019-04-11 04:24:36 -04:00
Mark van Alphen
c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
2019-04-11 07:27:51 +02:00
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines
Atmos Define Cleanup + Plasma Tweaks
2019-04-10 22:18:52 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
2019-04-10 21:54:54 +02:00
Fox McCloud
c536c55b28 Emote Refactor 2019-04-10 15:42:12 -04:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update
The Nations Update Everyone Deserves!
2019-04-09 20:47:34 -07:00
variableundefined
1a5b5dabe4 Merge pull request #11230 from Fox-McCloud/tweaks-crit
Newcrit Death Tweak
2019-04-10 10:47:02 +08:00
variableundefined
9ae231ee99 Merge pull request #10327 from Fox-McCloud/fix-cqc
Fixes and Updates CQC
2019-04-10 10:36:44 +08:00
variableundefined
17030d02fe Merge pull request #11214 from Arkatos1/Sling_Chat
Shadowlings now have a slightly bigger colored text when speaking in the Shadowling Hivemind
2019-04-10 10:13:16 +08:00