9ef7ca5ee6
Unique spectral sword sprite. ( #18322 )
2016-06-06 18:26:17 -05:00
744b722a12
Merge pull request #18241 from phil235/BloodRefactor
...
Blood refactor stuff
2016-06-07 10:09:35 +12:00
5fa854e252
Fixes a runtime when the AI uses binary chat
...
Might fix some bugs? Bugs that I introduced, but phil mentioned a
runtime.
2016-06-05 18:52:39 +01:00
40a371296a
Adding lizard blood pack in medbay storage's freezer crate.
...
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
2016-06-05 18:12:08 +02:00
69bd3575e3
Merge pull request #18228 from ChangelingRain/swordofRATVAR
...
Additional Ratvar conversion effects and related changes
2016-06-06 01:35:26 +12:00
050c42ff5e
Merge pull request #18174 from coiax/holodeck-cold
...
Adds two new holodeck levels
2016-06-06 01:23:43 +12:00
e816738280
Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR
2016-06-05 09:03:22 -04:00
9db2f57f36
Kills me, fucking, like, blows my brains out or something. ( #18231 )
2016-06-05 03:10:13 -05:00
4277d9bca2
Merge pull request #18215 from KorPhaeron/lava_staff_fix
...
[s]Fixes lava staff being used through walls
2016-06-04 20:48:50 -04:00
715e97e4b0
Merge pull request #18151 from RemieRichards/SlimeAttack!
...
Slimes may now be ordered to attack
2016-06-04 17:25:34 -04:00
d81db92008
Merge pull request #18214 from coiax/follow-link-define
...
Refactors all (F) links into using a define
2016-06-04 14:36:31 -04:00
bd20c313b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor
...
Conflicts:
code/__DEFINES/genetics.dm
code/modules/mob/living/carbon/human/species_types.dm
2016-06-04 17:41:43 +02:00
b482764a19
- I made human/handle_blood() less shitty.
...
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
2016-06-04 17:33:16 +02:00
9405446e08
important check
2016-06-04 11:20:59 -04:00
f8bd263eec
Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR
...
Conflicts:
icons/effects/effects.dmi
2016-06-04 07:34:13 -04:00
13dfd8dbf7
Peacekeepers now use Eye overlays, which means they close their eyes when they die :( ( #18209 )
...
Peacekeepers now have Eye overlays for being servants of Ratvar
Redid some of the shading and lineart for colours for Peacekeepers
2016-06-04 01:23:14 -05:00
3793e6187a
Addition Ratvar conversion effects and related changes
2016-06-03 23:19:13 -04:00
6fd1424619
Merge pull request #18085 from Xhuis/earsplitting_string
...
Clockwork Patch III
2016-06-03 19:55:04 -04:00
b7b4cc01ed
Throwing Runtime Fix ( #18076 )
2016-06-03 22:22:03 +02:00
2b18993b04
Conflicts II
2016-06-03 15:42:19 -04:00
fcd42f1464
Fixes lava staff being used through walls
2016-06-03 13:25:56 -05:00
311347b949
One day remie will leave and then none of my code will ever work
2016-06-03 10:02:20 -05:00
7d2a9abd8c
Fixes lavastaff properly
2016-06-03 09:56:10 -05:00
a2a4480e1b
Fixes lava staff being used through walls
2016-06-03 09:49:29 -05:00
afebc5ef97
Fixes ghost image runtime and see_darkness hiding ghosts again. ( #18158 )
...
(also fixes ghost images not garbage collecting.)
2016-06-03 16:49:08 +02:00
e13725b179
Refactors all (F) links into using a define
...
🆑
bugfix: Clicking the (F) link when an AI talks in binary chat will
follow its camera eye, the same as when (F) is clicked for its radio
chat.
/🆑
FOLLOW_LINK is a define that creates the clickable (F) link, so it
doesn't have to be typed painstakingly out every time we want to give
that link to an observer.
2016-06-03 15:29:28 +01:00
49f812fada
Merge pull request #18149 from KorPhaeron/pAI
...
pAI ash storm immunity
2016-06-03 08:09:00 +03:00
685d938481
Some more work or something, idk
2016-06-02 20:53:51 -04:00
9fdae2fe4e
Merge pull request #17576 from LatD/Research
...
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
546bb633cd
Adds two new holodeck levels
...
- Winter Wonderland
Apparently no one paid for christmas decorations, and it's
incredibly cold and low pressure. But it's a good counter
to a burn mix.
- Anthophila
"A simulation of a bee colony? Why is this in the restricted
section?" - Victim of the holodeck bee massacre
2016-06-02 16:34:41 +01:00
835c35e79e
Merge pull request #18111 from optimumtact/restinpeacekeeper
...
Removes peacekeeper borgs bolas
2016-06-02 02:25:33 -05:00
ca50d2283b
Slimes may now be ordered to attack, they will not attack their Friends, other slimes, the person who ordered them to attack or themselves.
...
#define'd Slime friendship levels.
2016-06-02 05:16:26 +01:00
3e3b6268e8
pAI ash storm immunity
2016-06-01 22:32:21 -05:00
5db8a76217
Revert "Updates some lavaland ruins and adds new ones."
2016-06-01 16:47:16 -05:00
ce5bd19adb
Merge pull request #18107 from lordpidey/lavaland_changes
...
Updates some lavaland ruins and adds new ones.
2016-06-02 09:07:32 +12:00
5e2348fd75
Merge pull request #18077 from KorPhaeron/beepsky_fix2
...
Fixes beepsky cuffing people with no arms
2016-06-01 12:49:40 -05:00
760803fe39
Changes return 0 to return FALSE
2016-06-01 12:23:50 -05:00
75f899caa5
Merge remote-tracking branch 'remotes/upstream/master' into clockwork_patch_3
2016-06-01 12:55:58 -04:00
5cbce38a55
Removes peacekeeper bola snare
2016-05-31 23:21:18 +00:00
83b3faf72f
Merge pull request #17676 from Core0verload/they-are-taking-our-jobs
...
Adds two new modes to cleanbots, allows playerbots to use emag functions
2016-06-01 09:56:13 +12:00
687cd053e7
Merge pull request #18082 from hornygranny/abhorrent_level_of_power_creep
...
aliens break cuffs instantly
2016-06-01 09:46:21 +12:00
0ae9ecb91c
Update carbon.dm
...
MUH DEFINES
2016-05-31 14:17:24 -07:00
1e4585bd86
Merge pull request #17923 from Shadowlight213/dronelight
...
Doubles drone light brightness
2016-05-31 13:59:52 -05:00
8a65c7e6ec
>it's a refactor everything while you're at it episode
2016-05-31 11:55:59 -07:00
cea21e4c57
Updates some lavaland ruins.
...
Adds lavaland wrath ruin.
Adds lavaland wrath ruin's reward.
Lavaland ruins can now cause sintouching.
2016-05-31 12:57:14 -04:00
614a2ab65b
Fixes infinite slip
2016-05-31 00:54:50 -07:00
c7967cb1a7
Merge pull request #18095 from KorPhaeron/drake
...
Hopefully stops drakes from bugging out
2016-05-31 19:06:33 +12:00
ab7b0b6f58
Drake
2016-05-31 02:02:05 -05:00
b654016574
Merge pull request #17936 from MMMiracles/ruin_stuff
...
Adds some spawnable shuttle templates for admin memery
2016-05-31 15:58:12 +12:00
59af849fdf
Clockwork post-merge patch 3
2016-05-30 22:55:27 -04:00
TechnoAlchemist
oranges
Jack Edge
phil235
Nerd Lord
Remie Richards
KorPhaeron
Xhuis
KorPhaeron
Kyle Spier-Swenson
Razharas
Cheridan
hornygranny
Mike Long
Shadowlight213