957f987b5d
Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet
...
Conflicts:
icons/effects/effects.dmi
icons/obj/items.dmi
2015-06-22 22:57:53 -05:00
f5f833ecbb
Merge pull request #9971 from KorPhaeron/newfloors
...
New Bluespace/Sepia slime reactions, new var for turfs
2015-06-23 03:43:28 +01:00
4ac8dd2fa6
Merge pull request #10023 from palpatine213/Ifyouwantitdoneright
...
Positronic Brain fixes
2015-06-23 03:39:27 +01:00
aa5541070c
Merge pull request #10082 from xxalpha/bass
...
Fixed not being able to insert a brain into an MMI.
2015-06-21 19:33:45 +02:00
3379fa5172
Fixed not being able to insert a brain into an MMI.
2015-06-21 17:50:03 +01:00
b1e252c69f
Merge pull request #10021 from phil235/AIFloatFix
...
Mobs that are anchored or buckled to something anchored no longer float in no gravity.
2015-06-21 10:45:49 -05:00
c79963f7b7
Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE
...
Malf AI module changes + Mechs for normal AIs!
2015-06-21 00:30:03 +01:00
05f65f04b8
Merge pull request #9866 from Xhuis/revenants
...
Revenant Rework (NOW WITH LESS CLOSING)
2015-06-20 13:24:02 -05:00
f5525749ce
Merge pull request #10027 from phil235/StraightJacketBuckleResistFix
...
Fixes being able to unbuckle yourself while straightjacketed
2015-06-20 00:07:56 -05:00
9e7c67c6a5
Fixes a check
2015-06-18 14:55:35 -07:00
ad3f81f88d
Custom spawn points and reforming ectoplasm
2015-06-18 13:18:53 -04:00
172ee5ec67
Fixes being able to unbuckle yourself while straightjacketed
2015-06-18 18:41:22 +02:00
bfb66ed518
Some more changes
2015-06-18 12:19:13 -04:00
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
c3170eaae8
Fixes Posibrains removing Traitors from check antags and also being pulled out of posibrains when debrained
2015-06-18 01:28:10 -07:00
08d273e9bd
Removes some coffee stains
2015-06-18 00:07:32 -04:00
984ad17613
Merge remote-tracking branch 'remotes/upstream/master' into fuggingRevenants
2015-06-18 00:05:45 -04:00
dd2e262344
A bit more work
2015-06-18 00:02:16 -04:00
f47f9c83a5
Mobs that are anchored or buckled to something anchored no longer float in no gravity. This fixes the floating AI (at least when it's anchored).
...
Remove an istype check in mob/process_spacemove() since projectiles are no longer anchored objects.
2015-06-17 23:11:24 +02:00
ab103b54dc
Righted some checks.
...
If newcolor
2015-06-17 21:03:11 +01:00
3b93604fa5
Merge pull request #9791 from AnturK/hallucinations
...
New hallucinations
2015-06-17 20:50:20 +02:00
1e55c8ac1a
Minor fixes
2015-06-17 18:59:28 +02:00
afe0a10bb2
Merge pull request #9989 from optimumtact/patch-3
...
PSHOOM
2015-06-17 18:01:11 +02:00
26d75cc5ba
Merge pull request #9863 from MrPerson/508_compilation
...
Makes the game compile in byond version 508
2015-06-16 19:38:11 +10:00
7aba70ecf3
DRAGnet lives!
2015-06-15 23:55:28 -05:00
e3580e4746
PSHOOM
...
PSHOOOOOOOOOOM
2015-06-16 13:04:47 +12:00
fd27d9d3bb
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/gamemodes/malfunction/Malf_Modules.dm
2015-06-15 12:26:28 -05:00
bc11259282
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/machinery/computer/aifixer.dm
2015-06-15 11:27:11 -05:00
9361c5efcd
Merge pull request #9973 from KorPhaeron/thirdtimesthecharm
...
Slaughter Demon
2015-06-15 17:25:01 +01:00
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
ce933a1a97
Slaughter Demon (again)
...
Had to recreate because I couldn't resolve the merge conflict.
New side event/antagonist. Simple animal that can use pools of blood as
portals to move around the station. Spooky scary.
-CtrlClick on an adjacent blood pool (or turf with blood on it) to
"enter" (start an infinite duration jaunt
-CtrlClick on a blood pool while jaunted to exit at that pool
-If you're pulling a mob while you enter a pool, the mob gets pulled in
with you, and you devour them, healing yourself
-Night vision
Adds an event (admin only) that spawns one.
Adds wizard item for summoning it. Has objective to kill the wizard (and
everyone else).
Also fixes typo/filepath for the scrying orb in the new wizard datum
thing.
If someone could help me with mind stuff so I can track how many people
it eats that'd be great.
Webm
http://www.singulo.io/tg/src/1433549232359.webm
2015-06-15 09:41:03 -05:00
8fc003029c
Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-06-15 16:34:56 +10:00
99735ea50d
New floors from xenobio/new var for turfs
...
Turfs now have a slowdown var that will determine how fast mobs move on
it.
Bluespace slimes can now create bluespace floor tiles which give -1
slowdown using blood
Sepia slimes can now create sepia floor tiles which give 2 slowdown
using blood
Camera and film reactions merged into a single water reaction
Bluespace crystal reaction moved to plasma
2015-06-15 01:33:00 -05:00
2e7ddc1f45
Merge pull request #9053 from MrPerson/screen_alert_2
...
More screen alerts
2015-06-15 01:00:20 +02:00
ec8cd61d4c
Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
...
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
b584d55826
Merge pull request #9918 from Firecage/Spiderfix2
...
Fixes spider verbs which I broke.
2015-06-14 17:15:31 -05:00
d657030e8e
Merge pull request #9628 from spasticVerbalizer/droneQuickEquip
...
Adds quick-equip verb for drones
2015-06-14 23:28:51 +02:00
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
4f177d1ff5
Merge pull request #9911 from MrPerson/lighting_ai_bugfix
...
Put the AI's static on top of lighting again
2015-06-14 10:32:36 -05:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
b92f518435
Readds wagging tail feature with WJohn's help on sprites
...
Changes some sprites to better show off highlighting
2015-06-13 20:34:38 -04:00
6d0c3840ab
Merge pull request #9882 from MrStonedOne/mctweaks
...
Tweaks MC's dynamic rate system a bit. Lowers lag from singulo getting released.
2015-06-13 04:37:00 +03:00
35962f343d
Merge pull request #9169 from Xhuis/sorry_goofball
...
Reverts goonchem, ports baymed, and adds physdesc feature
2015-06-13 04:31:07 +03:00
4373f6eece
Merge pull request #9904 from xxalpha/runtimesrun
...
Fixes three runtimes.
2015-06-13 04:29:20 +03:00
7902457ec1
Merge pull request #9893 from Iamgoofball/patch-76
...
removes RNG from emagging cyborgs
2015-06-13 04:25:42 +03:00
97fc115f0e
Fixes spider verbs which I broke.
2015-06-12 13:55:03 +02:00
d2ef043690
Resolved Conflicts:
...
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
595bb0c8e4
Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
...
Random lizard bodies will finally have color!
Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.
Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
20a2e98f8d
Put the AI's static on top of lighting again
...
Fixes #9884
Lights are layer 15, for reference. I think they used to be 12.
2015-06-11 20:35:50 -07:00
9ba7e6aaf4
Fixes three runtimes.
...
Better fix. src. purge
2015-06-11 21:30:13 +01:00
Cheridan
Remie Richards
phil235
xxalpha
Cheridan
palpatine213
Xhuis
phil235
AnturK
Jordie
Orange Borg
GunHog
KorPhaeron
kingofkosmos
Incoming
Razharas
Firecage
Ikarrus
MrPerson