Commit Graph

3861 Commits

Author SHA1 Message Date
oranges
98d9e3b619 Merge pull request #18249 from Incoming5643/D-D-D-Do_You_Have_It
Meaty Ores will now drop guts in addition to meat
2016-06-07 12:55:04 +12:00
Joan Lung
318b7268f8 Merge pull request #18108 from coiax/narnar-rune-ticker
Nar'sie rune can no longer be scribed off station or on shuttles
2016-06-06 18:56:10 -04:00
oranges
ccbc302876 Merge pull request #18282 from coiax/removing-spawn
Removes spawn() from some things
2016-06-07 10:21:54 +12:00
Jack Edge
8a1da445e3 Rip message var 2016-06-06 23:20:42 +01:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
Jack Edge
91332dcaae Code review 2016-06-06 23:07:29 +01:00
Jack Edge
f7c05b8bd9 Nar'sie rune anti-cheese and autoinvoke
🆑 coiax
rscdel: The Nar'sie rune automatically disappears if somehow transported
to a non-station z-level.
rscadd: The Nar'sie rune automatically invokes itself when drawn, and
every tick subsequently, so the Cultists of the Geometer can focus on
the more important task of congragating.
/🆑

- Made can_invoke() not require a user argument (for that auto-invoke)
- Removed unused user argument from fail_invoke, made message display an
argument (for that auto-invoke)
2016-06-06 23:07:04 +01:00
oranges
0a05b7c433 Merge pull request #18256 from KorPhaeron/cleanup
Removes some unused code
2016-06-07 10:03:27 +12:00
Leo
356f5947e2 Hand of God: Gods can't hear another god's divine telepathy (#18251)
Gods now can't hear other gods
2016-06-07 10:02:00 +12:00
Jack Edge
318ca08ecb Code review 2016-06-05 23:48:34 +01:00
Jack Edge
a01b48aa48 Removes spawn() from some things
Yay, refactoring.
2016-06-05 20:08:36 +01:00
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR
Additional Ratvar conversion effects and related changes
2016-06-06 01:35:26 +12:00
oranges
1e4b2b512a Merge pull request #18234 from coiax/laughter-for-all
Adds laughter demon to wizard's spellbook
2016-06-06 01:29:13 +12:00
oranges
0992b25903 Merge pull request #18189 from coiax/kill-all-laughter
Try to protect the ones we hug
2016-06-06 01:23:06 +12:00
Nerd Lord
50f2c15945 follow links 2016-06-05 09:10:27 -04:00
Nerd Lord
e816738280 Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 2016-06-05 09:03:22 -04:00
Nerd Lord
3c26a58a63 converted borgs/ais can control clockwork airlocks 2016-06-04 23:54:06 -04:00
Nerd Lord
8097a176bc set_ 2016-06-04 23:13:17 -04:00
Nerd Lord
428bbf6c75 heh heh 2016-06-04 22:44:49 -04:00
Nerd Lord
9928e97ab6 adds potential for two-way gateways 2016-06-04 22:36:16 -04:00
KorPhaeron
bc7fd50271 Removes unused code 2016-06-04 17:18:57 -05:00
Nerd Lord
a322291044 layering 2016-06-04 15:31:26 -04:00
Nerd Lord
12efe6788d fixes the fucking pixel shift 2016-06-04 15:03:49 -04:00
PKPenguin321
fecf0fbff0 removes rogue period (#18250) 2016-06-04 13:38:25 -05:00
Joan Lung
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
Incoming
7563a0dcf3 Meaty Ores will now drop guts in addition to meat. Xeno Meaty Ores will drop useful xeno organs. 2016-06-04 14:20:07 -04:00
Nerd Lord
51258f5784 fix 2016-06-04 14:00:57 -04:00
Nerd Lord
9a07805b83 300 is not 5 minutes 2016-06-04 13:48:12 -04:00
phil235
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
phil235
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
Nerd Lord
9405446e08 important check 2016-06-04 11:20:59 -04:00
Nerd Lord
30876bdb00 it's instant 2016-06-04 10:34:59 -04:00
Nerd Lord
c51b1503ac clockwork windoors 2016-06-04 10:27:27 -04:00
Nerd Lord
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
Jack Edge
5d19c28b1c Spelling changes, some grammar fixes 2016-06-04 12:01:32 +01:00
Jack Edge
be1bbba56a Adorableness 2016-06-04 11:03:21 +01:00
Jack Edge
eb8907cefe Adds laughter demon bottle to wizard's spellbook
🆑 coiax
rscadd: Wizards have been experimenting with summoning the slightly less
lethal "laughter demon". Please be aware that these demons appear to be
as dangerous as their slaughter cousins. But adorable, nonetheless.
/🆑

By popular demand.
Cheaper than a slaughter demon because it's not going to kill the crew,
it might even end up healing a bunch of people.
2016-06-04 10:56:10 +01:00
Nerd Lord
ab6cadec73 Merge branch 'master' of https://github.com/tgstation/tgstation into barriershimmer
Conflicts:
	icons/effects/effects.dmi
2016-06-04 00:19:18 -04:00
Nerd Lord
7dd8e897a2 they're doing their best okay??? 2016-06-03 23:36:45 -04:00
Nerd Lord
4942691972 get ye proc 2016-06-03 23:33:45 -04:00
Nerd Lord
ce75063e1a actual working damage 2016-06-03 23:24:04 -04:00
Nerd Lord
3793e6187a Addition Ratvar conversion effects and related changes 2016-06-03 23:19:13 -04:00
Xhuis
3f7f771fa1 Done and done 2016-06-03 19:42:02 -04:00
Xhuis
e863e544a1 I can code guys I swear 2016-06-03 16:41:19 -04:00
Xhuis
c45eea4ca9 Conflicts III 2016-06-03 15:43:17 -04:00
Xhuis
2b18993b04 Conflicts II 2016-06-03 15:42:19 -04:00
Xhuis
d40df77827 Conflicts I 2016-06-03 15:42:10 -04:00
Xhuis
adf47b8aa8 Two more small fixes 2016-06-03 15:40:19 -04:00
Xhuis
0ba90946dd Uhh? 2016-06-03 15:09:17 -04:00
Xhuis
70795389df More stuff, no conflict fix yet 2016-06-03 15:07:49 -04:00