Commit Graph

9301 Commits

Author SHA1 Message Date
phil235 f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02:00
phil235 d081a810af Merge pull request #9565 from AnturK/fixmix
Misc Fixes
2015-05-21 17:43:45 +02:00
phil235 81948d5f8c Merge pull request #9505 from Firecage/rainbowjumpsuit
This fixes the issue of colored jumpsuits not being dyeable into rainbow jumpsuits.
2015-05-21 16:20:38 +02:00
phil235 37abaffb50 Merge pull request #9431 from Incoming5643/wizard_fizard
Blacklists a few races to make spontanious race changes suck a little less
2015-05-21 15:52:48 +02:00
phil235 400d79655a Merge pull request #9526 from Jordie0608/bugsarethemotheroffeatures
Various more bugfixes
2015-05-21 15:45:18 +02:00
Swag McYolosteinen b6ec3d1036 Merge pull request #9452 from Cheridan/thickmaterial
Tangential THICKMATERIAL-related fixes
2015-05-20 16:13:41 +02:00
Cheridan ce9f2be8f9 Merge pull request #9534 from Iamgoofball/patch-67
Fixes a few chems having incorrect sleep values, and fixes some flags on Ephed and Stimulants
2015-05-20 08:22:48 -05:00
Cheridan 82b290ffd5 Merge pull request #9557 from kingofkosmos/altclickghosttogglefix
Alt-click-toggles now do proper checks
2015-05-20 08:03:25 -05:00
AnturK 8461818c4a Fixes statues not being able to attack/move in darkness 2015-05-19 19:59:34 +02:00
AnturK 2d6e01b547 Fixes statues moving in front of mechs 2015-05-19 17:43:47 +02:00
Jordie0608 8329b10890 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugsarethemotheroffeatures 2015-05-20 01:16:16 +10:00
Jordie0608 ffcba8cb61 damp rag can now inject or apply reagents 2015-05-20 01:12:16 +10:00
kingofkosmos 494403969e Alt-click-toggles now do proper checks
Such as if you're near the thing, conscious, alive etc.

Fixes #9238
2015-05-18 20:22:04 +03:00
Jordie0608 84eaa17ec9 reset ooc color buttons, changes how default color for admins is handled 2015-05-17 22:10:46 +10:00
Iamgoofball da63a8acc6 Fixes some med bugs too 2015-05-16 13:07:30 -07:00
Iamgoofball 479f38fb61 Fixes a few chems having incorrect sleep values
phil forgot to change some of these when doing 1tick
2015-05-16 13:04:25 -07:00
Alek2ander 2e44f37797 Fixes grenade bullshit 2015-05-16 21:53:04 +03:00
phil235 579cc5b38e Merge pull request #9502 from MartiUK/issue9492
Fix microwave cleaning typo.
2015-05-16 19:11:18 +02:00
Jordie0608 2b9c8ac98c fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons 2015-05-17 01:58:46 +10:00
Cheridan e784f6dbf0 Merge pull request #9489 from Jordie0608/youcantstopthefixesmal
Bugfixes Episode III: Revenge of the code
2015-05-15 14:13:00 -05:00
Cheridan 9dfc13cbb7 Merge pull request #9491 from RemieRichards/ManyImageCaches
Misc Image Caches
2015-05-15 13:44:21 -05:00
Cheridan 989d4902f5 Merge pull request #9469 from RemieRichards/ReagentColours
Ports /vg/ chem weighted colour averaging
2015-05-15 12:41:33 -05:00
Cheridan 69eb118653 Merge pull request #9478 from GunHog/A_Poisitive_Change
Posibrain activation tweaks
2015-05-15 12:25:22 -05:00
Cheridan ad281d6a32 Merge pull request #9240 from Firecage/SimpleAnimalClownsHumanCorpses
Makes Simple Animal Clowns drop Human Clown corpses.
2015-05-15 12:09:09 -05:00
Firecage 5962b1b449 This fixes the issue of colored jumpsuits not being dyeable into rainbow jumpsuits. 2015-05-15 16:39:20 +02:00
GunHog 50bd5ae744 Fixes 9500
- Prevents one user stealing the posibrain of another if they both open
and accept the prompt at the same time.
2015-05-15 06:49:02 -05:00
Martin Kemp 092c8238c0 Fixed cleaning microwave typo.
Fixes #9492.
2015-05-15 12:05:02 +01:00
Razharas 3410d3a0f6 Merge pull request #9461 from xxalpha/petethegoat
A handful of fixes.
2015-05-15 02:05:16 +03:00
Remie Richards 28cd8ea0f1 Image Caches:
Mining rock turf edge overlays
Alien weed overlays
SMES overlays
2015-05-14 16:40:15 +01:00
Jordie0608 339f892ad2 corgi collar, facehugger and icecreamsandwich fix 2015-05-14 22:29:53 +10:00
Swag McYolosteinen 287de468ff Merge pull request #9296 from RemieRichards/VentcrawlingFixes
Ventcrawling Fixes
2015-05-14 12:25:11 +02:00
xxalpha 4da1eb4399 Fixed emitter beams not being reflectable. 2015-05-13 21:45:46 +01:00
xxalpha 79c96e1bf1 Fixed emitter beam esword reflection runtime error. 2015-05-13 21:16:52 +01:00
GunHog 9c370c75e8 Posibrain activation tweaks
- Ghosts will now get a link that allows them to enter a Positronic
Brain as part of the notification message.
- Human players can now manually activate Poistronic Brains to notify
the ghosts again.
- Ghost notification for Positronic Brains now has a global cooldown of
one minute.
2015-05-13 12:20:07 -05:00
Cheridan ba20b8a265 Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
Resolves #1358, /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
Jordie0608 ec9382c43b Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
2015-05-13 20:01:27 +10:00
Jordie 01ad517894 Merge pull request #9457 from Cheridan/hoes
KEEP YOUR HOES IN LINE
2015-05-13 19:50:18 +10:00
Jordie df2433a43f Merge pull request #9451 from Xhuis/whyAreThereFortyShadowlings
Adds a Create Shadowling button
2015-05-13 19:46:12 +10:00
Jordie c769a45b3c Merge pull request #9449 from Incoming5643/con_troll
Minor Check Antagonist Panel Beautification
2015-05-13 19:45:22 +10:00
Jordie 9b8abb39ff Merge pull request #9441 from Thunder12345/yousawnothing
Removes duplicate armoralt state in suit.dmi
2015-05-13 19:44:49 +10:00
Remie Richards c49bf89b15 Ports /vg/ chem weighted colour averaging 2015-05-12 23:55:35 +01:00
Cheridan f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
Jordie e1f5ed793d Merge pull request #9356 from Firecage/Kudzulogs
Adds logs for admins to kudzu.
2015-05-11 23:58:38 +10:00
Cheridan 5dfe2cad16 Merge pull request #9359 from GunHog/Posibrain_Change
[DNM] Changes Posibrain activation from pAI style to drone style
2015-05-11 08:32:15 -05:00
Cheridan c9d2e07466 Merge pull request #9410 from phil235/HeadcrabRuntimeFix
Fixes a runtime with headcrabs controled by non changeling players.
2015-05-11 08:18:56 -05:00
Firecage c6b0c8b390 Investigate logs for kudzu planting 2015-05-11 15:18:01 +02:00
Jordie0608 000ddd68ac removes stowed containers being cleared of reagents 2015-05-11 22:38:34 +10:00
Cheridan 3cf965a228 Tangential THICKMATERIAL-related fixes
-Monkey bites now respect THICKMATERIAL. Essential for monkey mode.
-Fixes Combat Hypo for Nuke Ops (wtf were you thinking goofball??), important since their thick hardsuits prevent many other forms of healing. Now it'll be better at healing and very good at helping up ops who are in crit.
2015-05-10 21:32:32 -05:00
Xhuis aa52d59b18 Adds a Create Shadowling button 2015-05-10 22:07:19 -04:00
Incoming 562bff95b4 Slightly widens the check antagonist panel
Makes the "(logged out)" flag on antagonists read "(ghost)" because that's what it's actually tracking

Together these fix #9268

Also sneaks a bit of mulligan functionality in so admins can see what the time and life checks for the mulligan system are, and modify them midround if desired.

Also shows and allows editing of the "on failure" behavior of mulligans, specifically if they default to instant round ending if the mulligan fails or if it just doesn't create antags.
2015-05-10 20:06:00 -04:00