Commit Graph

3304 Commits

Author SHA1 Message Date
lordpidey
f640d7ddb7 Devil fixes (#18520)
Numerous small fixes/changes/balances to devils.

Notable changes:
It now requires more souls to increase. It is now 3,7,12 souls, up from 3,6,9.
Devils now have extra rules, no coercing into signing contracts with violence, and no intentionally physically harming another devil.
Burial garment banishment now works on true devils. <--- Unreported issue, can I use that fix for the mergetoken?
Renamed all demon files to devil
Updated religious supplies to have burial garments.
Burial garments re-added to box/meta
Increased infernal fireball cooldown
Soulsellers can now use a pitchfork without being harmed.
Added new book crate, which includes a codex gigas to cargo.
2016-06-14 15:43:33 +12:00
oranges
b20a5642de Merge pull request #18473 from RemieRichards/setDir()
Set dir()
2016-06-13 00:03:44 +12:00
Jordie0608
0846d6f30d fixes fire logging bracket 2016-06-12 20:58:55 +10:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
Jordie
0777916328 Merge pull request #18402 from optimumtact/flamingfunremoval
Better logging and notification of setting on fire
2016-06-11 23:53:34 +10:00
oranges
bf9643563d Ensure we only log and notify admins when person is set on fire
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
2016-06-11 13:08:05 +00:00
oranges
fc23d8464c Merge pull request #18386 from hornygranny/patch-8
fixes godhand not deleting on drop
2016-06-10 11:51:17 +12:00
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
59b72ec25c Better logging and notification of setting on fire
This also logs bump fire to the gamelog incase someone ever needs to
find out who set who on fire with bumping (left out of admin
notification) as it would be very spammy
2016-06-09 06:31:23 +00: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
hornygranny
6f9168aee1 fixes godhand not deleting on drop
fixes dismembering chaplains to steal the godhand
2016-06-08 16:21:50 -07: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
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
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
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
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
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
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
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
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
Thunder12345
a9a97f5a81 Fixes for Merge Tokens (#18168)
* fixes #15649
fixes #16575

* oops forgot those lines
2016-06-03 14:46:42 -05: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
26cbf2e3bb You've been down too long in the midnight sea 2016-05-30 23:35:03 -05:00
KorPhaeron
aea72a79fd New Chaplain Weapons 2016-05-30 22:01:51 -05:00
PKPenguin321
537b8d85dc adds letterman jackets 2016-05-30 17:13:00 -07:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
xxalpha
0d608250fa Changed AI core programming so it functions like the AI Upload. (#18004) 2016-05-30 10:54:50 +12:00
kevinz000
c88c964f26 Minor Tweaks for PK borgs + recharger (#17940)
Cyborg rechargers now recharge a minimum of 200/tick, up from a default setting of 20/tick
PK borg cookie dispensers now have a 1 second cooldown
PK borg hug shocks has a 2 second cooldown up from 1
Cyborg hyposprays now log
PK borg harm alarm emagged will no longer stun you if you have bowman headset
PK borgs are the only cyborgs that can hugshock and hugcrush (I added hugs for it, medborgs, and standard borgs
2016-05-30 10:52:52 +12:00
LatD
712c4e81a8 Code review improvements 2016-05-28 13:11:57 +03:00