Commit Graph

4993 Commits

Author SHA1 Message Date
nullbear
98ee507de8 Adds noteleport variable
This is mostly a pre-setup for my greater-bag-of-holding stuff.

You can't use bluespace crystals/jaunters/hand teleporters to access bluespace-proofed areas. at the moment, this only applies to shuttles and centcomm.

Teleport beacons placed in bluespace proofed rooms can't be teleported to, except via teleporter station hub.

A little concerned because now 'hijack' antags cant use teleprods to fling everyone out of the shuttle while in transit. q_q could easily just make the shuttle non-bluespace proof though.

Note for mappers: This means you can create ruins that can't be teleported into using bspace crystals by setting the area "noteleport" to 1. This can be used to force players to travel through the ruin the way they're intended to. Or to prevent them from gaining access to areas they shouldnt normally be able to. (ie. the wishgranter ruin)
2016-06-09 20:33:25 +12:00
oranges
c143e30ab5 Merge pull request #18350 from GunHog/AshTreaders
Mining Cyborg Ash Storm Plating Upgrade
2016-06-09 15:46:06 +12:00
oranges
a08cff21f0 Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know
Renames and relores loyalty implants to mindshield implants.
2016-06-09 15:39:53 +12:00
oranges
4af9392f01 Merge pull request #18333 from KorPhaeron/charter
Captain's Charter/Captain can name the station
2016-06-09 15:39:41 +12:00
KorPhaeron
576c215270 Fixes charter 2016-06-08 21:04:01 -05:00
oranges
d5389459fb Merge pull request #18359 from lzimann/doublesharp
Fix dual e-swords not being able to dismember
2016-06-09 09:16:19 +12:00
Lzimann
bd8f24f509 Moves sharpness and w_class after DNA check 2016-06-08 10:43:42 -03:00
AnturK
05b9307a09 Merge pull request #18335 from Fox-McCloud/experimental
Experimentor Fixes
2016-06-08 13:14:57 +02:00
AnturK
a14fe0c18b Merge pull request #18323 from KorPhaeron/clown_buff
Clown makes a sad trombone noise on death
2016-06-08 10:47:56 +02:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme
Defers some list initializations
2016-06-08 19:20:04 +12:00
Lzimann
8f014d93ca Now they actually dismember 2016-06-07 21:35:12 -03:00
GunHog
61b235d23c Merge remote-tracking branch 'remotes/upstream/master' into AshTreaders
# Conflicts:
#	code/modules/research/designs/mechfabricator_designs.dm
2016-06-07 18:37:38 -05:00
Lzimann
a16ce87454 Dual e-swords dismemberment 2016-06-07 18:15:56 -03:00
oranges
0408ffa9ba Merge pull request #18299 from PKPenguin321/patch-6
fixes hulks attacking with dual eswords
2016-06-08 09:11:18 +12:00
Joan Lung
61c2d6aee0 Merge pull request #18279 from GunHog/Mining_Borgs_Need_Love_Too
Mining Cyborg Hyper-Kenetic Accelerator Upgrade
2016-06-07 17:09:39 -04:00
TechnoAlchemist
7c0760764d fuck 2016-06-07 13:44:06 -07:00
TechnoAlchemist
10c547d364 Coiax 2016-06-07 13:43:11 -07:00
AnturK
19eb97ae18 Moves some list initializations to New
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
GunHog
ff90dda131 Mining Cyborg Ash Storm Plating Upgrade
Adds an upgrade to Mining Borgies which will make them immune to ash
storms while looking TOTALLY AWESOME.
2016-06-07 11:25:19 -05:00
TechnoAlchemist
154982500b God is good. 2016-06-07 04:54:06 -07:00
LatD
25827d6ccb [Ready] Tweaks some R&D levels (#18246)
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
2016-06-07 20:18:19 +12:00
KorPhaeron
51d7f86e6a Admin Override 2016-06-07 01:57:33 -05:00
Fox-McCloud
4ce47d1a6f Experimentor Fixes 2016-06-07 02:10:44 -04:00
KorPhaeron
69a6ce2e5d Captain's Charter 2016-06-07 00:14:39 -05:00
Jack Edge
8cbb10cab2 Moved dragon loot into necropolis_chests.dm
In addition:
- Added an admin notification when dragon blood causes the dragon
transformation.
- Fixes #18275, lava staff can no longer turn transit tiles to lava.
2016-06-07 02:57:12 +01:00
oranges
05b4e82e02 Merge pull request #18272 from xxalpha/nukemyshitup
Syndicate toolbox now has syndicate screwdriver.
2016-06-07 12:57:44 +12:00
KorPhaeron
3526562fa2 The joke was on me all along 2016-06-06 19:08:48 -05:00
PKPenguin321
5d76e239ef moves the parent call 2016-06-06 17:02:08 -07:00
KorPhaeron
cd4855688d Sad Trombone Implant 2016-06-06 18:49:14 -05:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
PKPenguin321
09bb9cbcb9 fixes up some toy sword checks (#18252)
removes broken check.
Fixes https://github.com/tgstation/tgstation/issues/18248
adds a missing return to account for nodrop items.
2016-06-07 10:02:34 +12:00
Cheridan
35c8e92ad7 Merge pull request #18265 from KorPhaeron/sword_fix
Sword Fix
2016-06-06 00:39:09 -05:00
PKPenguin321
70c9cff674 fixes hulks attacking with dual eswords 2016-06-05 21:49:59 -07:00
GunHog
80065468d4 Hyper KA for mining borgies <3
- Mining Cyborgs may now be upgraded with Hyper-Kenetic Accelerators
- Same cost and reqs as human version.
2016-06-05 11:57:39 -05:00
phil235
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
xxalpha
d1dbcd3ee0 Syndicate toolbox now has syndicate screwdriver. 2016-06-05 12:29:45 +01:00
KorPhaeron
ead7bd090a Sword Fix 2016-06-04 20:08:38 -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
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
TechnoAlchemist
65ba2d2800 Makes cloth not have force anymore. (#18204) 2016-06-04 01:23:29 -05:00
MMMiracles
7c8603a0a8 important features (#18195) 2016-06-03 14:48:12 -05:00
Thunder12345
a9a97f5a81 Fixes for Merge Tokens (#18168)
* fixes #15649
fixes #16575

* oops forgot those lines
2016-06-03 14:46:42 -05:00
Jack Edge
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
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
oranges
c27a9a21bb Merge pull request #18070 from PKPenguin321/clothing-by-nienhaus
Adds letterman jackets
2016-06-02 09:01:29 +12:00
KorPhaeron
d5dddf5bae Kills the sword ghost properly 2016-05-31 17:13:59 -05:00
KorPhaeron
8d65a58e2c Fixes sword naming 2016-05-31 16:13:25 -05:00
KorPhaeron
9042c84087 The sword names itself now 2016-05-31 13:28:36 -05:00
KorPhaeron
d4240c5378 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
2016-05-31 12:03:01 -05:00