adf553db5c
Removes the singularity's toxin damage effect on mob.
2015-06-26 18:14:34 +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
0b91e9d8e4
Merge pull request #10126 from Jordie0608/idkhowtheserverevenranwiththiserroraround
...
Critical fix to admin memos and watchlist
2015-06-26 10:44:03 -05:00
8c9169f9a8
Merge pull request #10144 from phil235/StimulantsBuff
...
Buffs stimulants reagent.
2015-06-26 10:37:46 -05:00
1ce57fa0b9
Merge pull request #10130 from xxalpha/fixfixfix
...
Fixed reviver implant emp_act() resetting cooldown time.
2015-06-26 10:00:28 -05:00
792a30413e
Fixes telesci console icon
2015-06-26 17:03:29 +03:00
88ee215429
Removed arm protection from jacket
2015-06-26 02:37:54 -05:00
d3f78294ad
fixes edit reason and log for follow
2015-06-26 16:13:40 +10:00
9ae5728a78
Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit
2015-06-25 19:15:08 -05:00
d0853e8c4f
Gets rid of an old unneeded for loop, reverse copypastas it from where I picked it up.
2015-06-25 19:40:55 -04: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
15cdf9bfca
Merge from upstream.
2015-06-25 20:30:19 +02: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
27b5d59d28
Ports over the military jacket from NTStation
2015-06-25 02:44:25 -05: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
83629764d8
Buffs stimulants reagent. Changes the uplink stimpack description (immune to stuns -> nearly immune)
2015-06-25 00:55:11 +02:00
3c6607ad19
Fixes sleepy pen having enough morphine to trigger the overdose message, making it not stealthy. morphine amount reduced from 30 to 20u.
2015-06-25 00:30:09 +02: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
6cab00e31b
Reverts BPRED change.
2015-06-24 19:51:28 +02:00
33b9fc3a2c
Update bottle.dm
2015-06-24 10:32:55 -07:00
9522feea87
phil says this fixes the armor problem TAKE 2
...
expand dong
2015-06-24 10:27:48 -07:00
305daf5d92
Fixed reviver implant EMP resetting cooldown time.
2015-06-24 15:36:40 +01: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
d079104e05
fixes schema and send2irc message
2015-06-24 16:54:59 +10:00
29d7122095
Merge branch 'master' of https://github.com/tgstation/-tg-station into idkhowtheserverevenranwiththiserroraround
2015-06-24 16:48:17 +10:00
dbad5fdea4
critical fix to admin memos
2015-06-24 15:58:41 +10:00
afe32fe012
Buffs the traitor toxins
...
For poisons I'm spending TCs on, these are really weak. Overall consensus is they aren't powerful enough, this should make them more used.
2015-06-23 21:00:32 -07: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
c7e0b96314
Merge pull request #10083 from MrStonedOne/ISTHISVALID
...
Admins can now reject shitty adminhelps
2015-06-23 14:26:11 -05:00
2253a68c4b
Merge conflict fix
2015-06-23 18:00:11 +02:00
67ec200bc7
Few More Changes
2015-06-23 09:12:56 -06:00
64f4adb41e
Merge pull request #9510 from Cheridan/nuke_feedback
...
Nuke Op COMMUNITY FEEDBACK PR
2015-06-23 07:03:17 +01:00
ffedaeaeef
Merge pull request #10072 from Ikarrus/shuttleloanclarity
...
Cargo Shuttle Event Announcement Clarity
2015-06-22 23:50:37 -05:00
f1fbfd93e6
Merge pull request #10029 from RemieRichards/ArmourPenetration
...
Armour Penetration and Armour Damage Reduction nerf
2015-06-22 23:49:18 -05:00
7b6fdbc8ce
Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier
...
Ports watchlist flagging for ckeys
2015-06-22 23:36:06 -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
95b2cc2b09
Merge pull request #10092 from TheVekter/dangerwillrobinson
...
Danger Update: Meteors, Rods, Flux and Grav
2015-06-23 03:39:41 +01:00
4ac8dd2fa6
Merge pull request #10023 from palpatine213/Ifyouwantitdoneright
...
Positronic Brain fixes
2015-06-23 03:39:27 +01:00
ab4a0ade28
fixed the changelog FOR REAL THIS TIME, also fixed bad coding
2015-06-22 21:30:50 -05:00
16504ef0cf
Cleaned some clothing flags. Ported turf/Entered optimization from vg.
2015-06-23 01:52:14 +01:00
63358dcc78
fixing the formula.
2015-06-22 18:12:52 +02:00
phil235
Cheridan
Razharas
TheVekter
Jordie0608
TheVekter
Incoming
NullQuery
phil235
Ikarrus
LaharlMontogmmery
Iamgoofball
xxalpha
spasticVerbalizer
Remie Richards
Cheridan