3fe48e2f26
Merge pull request #10248 from optimumtact/patch-6
...
log simple animal attacks to attack log
2015-06-29 23:03:12 -05:00
1368794705
Merge pull request #10112 from Ikarrus/whyamiinspace
...
Reactive Teleport Armor can teleport the user to space tiles again
2015-06-29 22:11:03 -05:00
87cd31c11f
Merge pull request #10211 from Ikarrus/burntweaks
...
Destructible Clothing Tweaks and Fixes
2015-06-29 21:38:20 -05:00
3b4dbc4f27
Merge pull request #10216 from nukeop/syndiesurgerybag
...
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
f0d4dda9e1
Merge pull request #10218 from optimumtact/patch-3
...
Jetpack speed changes
2015-06-29 15:01:53 +10:00
77a77dd107
Jetpack speed changes [DNM]
...
being in zero grav now gives a -1 speedup (as if you had gottagofast)
being in zero grav with a jetpack gives -2 (gottagoreallyfast)
The gottagofast and gottagoreallyfast flags only apply in gravity situations now
2015-06-29 15:30:55 +12:00
efcd5f3f75
log simple animal attacks to attack log
2015-06-29 15:24:34 +12:00
4dbb5feb2d
If ex_act(2) is softened by armor, shredding chance gets halved
2015-06-28 20:29:13 -06:00
4f4b8f1774
Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/job_closets.dm
2015-06-28 19:00:16 -06:00
48dedda36b
ABSTRACT items cannot be shredded
2015-06-28 18:55:34 -06:00
6c0a930cfb
Merge pull request #10173 from Incoming5643/coding_stupid_shit_is_my_antidrug
...
Rainbow slimes finally obtainable
2015-06-28 18:01:30 -05:00
d07e315ddf
Squashed
2015-06-28 12:11:05 -06:00
e8d3deafab
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
7dfcc292b7
add a variable to mmi to indicate if it's of the syndicate variety as
...
suggested
2015-06-28 12:44:25 +01:00
0316a836cb
add a Syndicate surgery dufflebag full of tools to the uplink
...
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
7894263033
Destructible Clothing Tweaks
...
- Fixes runtime with burning decals without reagents
- Adjusts some burnable flags
- Removes minimum shred prob()
2015-06-27 13:33:33 -06:00
59ca40f03d
Burning objects are processed every tick now instead of using a spawn() check
2015-06-27 09:22:14 -06:00
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
46d7fb9bbd
Merge pull request #10168 from phil235/FireaxecabinetFix
...
Fixes runtime with do_after()'s that don't use a target.
2015-06-26 20:12:15 -05:00
a65ba96ecf
Merge pull request #10020 from phil235/HiveloardCoreSmearing
...
Changing messages when using hivelord core
2015-06-26 15:45:31 -05:00
b9cdb3384a
Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours
...
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
2015-06-26 15:34:24 -05:00
3f1ecc5721
Merge pull request #10097 from phil235/SomeFixes
...
Some little fixes
2015-06-26 15:24:46 -05:00
2e61607d3f
Merge pull request #10105 from xxalpha/chief
...
Cleaned some clothing flags.
2015-06-26 19:03:13 +02:00
f104517c89
Merge pull request #10146 from phil235/QueenUnconsciousIconFix
...
Fixes stomach rumbling message, large xenoqueen unconscious icon, stamina stacking on aliens
2015-06-26 10:51:47 -05:00
ac321c547c
Rainbow slimes finally added to practical play. To get one you have to raise slimes through select breeding to 100 mutation chance. Even if you're blessed with RNG This will take a minimum of 14 generations of slime. Red slime can help speed this a bit, but then you're trading plasma for time. From the default mutation chance you'd have to drop 6 of these potions.
...
Rainbow slimes only split into more rainbow slimes.
Rainbow slime cores spawn a random colored slime on use, the practical use is to allow xenobiologists to slime paths they didn't breed for initially if they practiced good slime eugenics. You're still at the utter mercy of RNG though.
Mostly a bragging rights reward.
2015-06-25 18:20:09 -04:00
2aeefad94d
Fixes runtime with do_after()'s that don't use a target.
...
Adding missing "target=src" to a couple do_after() calls.
You can now close a fire axe cabinet by clicking it with a full hand (if it's not broken/locked)
2015-06-25 19:05:23 +02:00
8e62d51812
Merge pull request #9801 from AnturK/rosebud
...
Buffs whispers
2015-06-25 13:39:56 +02:00
3d5f126779
Destructible Clothing [WIP]
...
- Clothes can be set on fire and extinguished
- Any item can technically be set on fire and extinguished now, but only clothes (and paper) actually burn right now
- All of a mob's clothing are burned if the mob is husked by fire
- Clothes will also have a chance of being shredded if you are caught in a bomb blast
- The bigger the explosion, the higher the chance they have of being destroyed
- Outer layer clothing (headgear and exosuits) take the shock first, which absorbs some of the shock for the clothes it covers, according to it's bomb armor
2015-06-25 00:06:47 -06:00
28a030360c
Fixes wrong message when a mob moves while inside another mob's stomach.
...
Fixes large xenoqueen having wrong icon when unconscious.
Aliens now naturally recover from stamina damage.
2015-06-25 02:15:49 +02:00
b8e8aa9123
forceMove(picked)
2015-06-24 17:55:05 -06:00
a029f2852a
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00
ac63896910
- Foam/moke lifetime is no longer affected by reagents volume.
...
- Remove show_message argument from blob reagent reaction_mob()'s and remove the if(show_message) send_message(). Now send_message is called directly on each blob strike.
- Changed blob reagent effects to depend on volume so blob spore smoke isn't deadly.
- Breathing smoke now reduces its life expectancy and calls reaction(INGEST) with the accurate amount of reagent.
- Adjusted the effects on mobs of some other reagents.
- Adjusted reagent amounts in chem grenades.
2015-06-24 20:58:22 +02:00
9b616daf8f
Merge pull request #9837 from spasticVerbalizer/muteMessageFix
...
Prevents 'unable to speak' spam on empty message
2015-06-24 20:15:19 +02:00
9522feea87
phil says this fixes the armor problem TAKE 2
...
expand dong
2015-06-24 10:27:48 -07:00
58399f7602
Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
...
Conflicts:
icons/obj/items.dmi
2015-06-24 20:31:51 +10:00
d18a98864a
Remove optimization code.
2015-06-24 01:14:20 +01:00
0797226d2e
Merge remote-tracking branch 'upstream/master' into chief
...
Conflicts:
code/modules/clothing/spacesuits/hardsuit.dm
2015-06-23 21:50:16 +01:00
a8ec1c76df
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
62e635484a
Merge pull request #10069 from Ikarrus/gangrecruitnerf
...
Gang Update: Recruitment Edition
2015-06-23 14:33:13 -05:00
2253a68c4b
Merge conflict fix
2015-06-23 18:00:11 +02:00
adaef34fa8
Reactive Teleport Armor can teleport the user to space tiles again
...
Now they actually have a risk to using them again instead of being the perfect powergaming armor!
2015-06-23 08:57:54 -06:00
f1fbfd93e6
Merge pull request #10029 from RemieRichards/ArmourPenetration
...
Armour Penetration and Armour Damage Reduction nerf
2015-06-22 23:49:18 -05:00
3b326a973b
Additional Changes
2015-06-22 22:29:51 -06:00
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
16504ef0cf
Cleaned some clothing flags. Ported turf/Entered optimization from vg.
2015-06-23 01:52:14 +01:00
1accee1c36
Fixes singularity not applying its tox damage to mobs. Adjusted its radiation and toxdamage values.
...
Fixes simple animals that needs to breath not taking damage from lack of gas to breath on space turfs.
Fixes revenant not being spaceworthy.
Fixes simple_animal accumulating radiation indefinitely because they are unaffected by it.
2015-06-22 16:10:24 +02:00
5242108c4d
a few fixes
2015-06-22 01:39:32 +02:00
Cheridan
Jordie
Orange Borg
Ikarrus
phil235
barackobama
phil235
Incoming
Iamgoofball
xxalpha
spasticVerbalizer
Cheridan
Remie Richards