858fb9a33e
Added allow_drop() on machinery.
...
I didn't actually touch this, git.
2015-05-16 02:36:02 +01:00
5951aeccb8
Fixed dropping items in mechs AND EVERYTHING ELSE
...
Better fix for dropping items in mechs.
2015-05-16 02:04:42 +01:00
68c1158427
Fixed being able to insert NODROP items into people with cavity implant.
...
Changed fix to use the right bitwise operator.
2015-05-16 01:06:51 +01:00
9bfcf4acfb
COMMUNITY FEEDBACK UPDATE
...
-Nuke Hardsuits are no longer unremovable when in combat mode, allowing for better healing/defibbing.
-Explosive implants reduced to 4 TC.
If you don't want to get looted, get good and don't die or buy an implant.
2015-05-15 17:06:22 -05:00
f0351e1890
Tweaked uplink prices.
...
Undo X-ray requirement change.
2015-05-15 21:54:08 +01:00
e784f6dbf0
Merge pull request #9489 from Jordie0608/youcantstopthefixesmal
...
Bugfixes Episode III: Revenge of the code
2015-05-15 14:13:00 -05:00
9dfc13cbb7
Merge pull request #9491 from RemieRichards/ManyImageCaches
...
Misc Image Caches
2015-05-15 13:44:21 -05:00
989d4902f5
Merge pull request #9469 from RemieRichards/ReagentColours
...
Ports /vg/ chem weighted colour averaging
2015-05-15 12:41:33 -05:00
69eb118653
Merge pull request #9478 from GunHog/A_Poisitive_Change
...
Posibrain activation tweaks
2015-05-15 12:25:22 -05:00
ad281d6a32
Merge pull request #9240 from Firecage/SimpleAnimalClownsHumanCorpses
...
Makes Simple Animal Clowns drop Human Clown corpses.
2015-05-15 12:09:09 -05:00
5962b1b449
This fixes the issue of colored jumpsuits not being dyeable into rainbow jumpsuits.
2015-05-15 16:39:20 +02:00
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
092c8238c0
Fixed cleaning microwave typo.
...
Fixes #9492 .
2015-05-15 12:05:02 +01:00
3410d3a0f6
Merge pull request #9461 from xxalpha/petethegoat
...
A handful of fixes.
2015-05-15 02:05:16 +03:00
28cd8ea0f1
Image Caches:
...
Mining rock turf edge overlays
Alien weed overlays
SMES overlays
2015-05-14 16:40:15 +01:00
339f892ad2
corgi collar, facehugger and icecreamsandwich fix
2015-05-14 22:29:53 +10:00
287de468ff
Merge pull request #9296 from RemieRichards/VentcrawlingFixes
...
Ventcrawling Fixes
2015-05-14 12:25:11 +02:00
4da1eb4399
Fixed emitter beams not being reflectable.
2015-05-13 21:45:46 +01:00
79c96e1bf1
Fixed emitter beam esword reflection runtime error.
2015-05-13 21:16:52 +01:00
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
ba20b8a265
Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
...
Resolves #1358 , /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
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
01ad517894
Merge pull request #9457 from Cheridan/hoes
...
KEEP YOUR HOES IN LINE
2015-05-13 19:50:18 +10:00
df2433a43f
Merge pull request #9451 from Xhuis/whyAreThereFortyShadowlings
...
Adds a Create Shadowling button
2015-05-13 19:46:12 +10:00
c769a45b3c
Merge pull request #9449 from Incoming5643/con_troll
...
Minor Check Antagonist Panel Beautification
2015-05-13 19:45:22 +10:00
9b8abb39ff
Merge pull request #9441 from Thunder12345/yousawnothing
...
Removes duplicate armoralt state in suit.dmi
2015-05-13 19:44:49 +10:00
c49bf89b15
Ports /vg/ chem weighted colour averaging
2015-05-12 23:55:35 +01:00
474bf2667c
Almost like magic, it works. CODE MAGIC.
2015-05-12 22:23:25 +01:00
99a5bbbd6f
Cleaned up comment.
2015-05-12 18:38:15 +01:00
f3e91beba6
KEEP YOUR HOES IN LINE
2015-05-11 15:58:18 -05:00
0ba314552a
The initial tweaks are in place, ran out of time to finish it though.
2015-05-11 18:54:31 +01:00
e1f5ed793d
Merge pull request #9356 from Firecage/Kudzulogs
...
Adds logs for admins to kudzu.
2015-05-11 23:58:38 +10:00
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
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
c6b0c8b390
Investigate logs for kudzu planting
2015-05-11 15:18:01 +02:00
000ddd68ac
removes stowed containers being cleared of reagents
2015-05-11 22:38:34 +10:00
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
aa52d59b18
Adds a Create Shadowling button
2015-05-10 22:07:19 -04:00
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
bf29f46f57
Removes duplicate armoralt state in suit.dmi
2015-05-10 16:52:32 +01:00
7e0e50302a
Merge pull request #9436 from MrStonedOne/powerfixes
...
Merges power subsystem into machine subsystem.
2015-05-10 08:23:20 +01:00
c6c7237265
Merges power subsystem into machine subsystem.
...
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
2015-05-09 23:48:18 -07:00
931e93c14c
caps horrid icon operation to 100
2015-05-10 15:12:23 +10:00
502d21a4da
Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine
...
Conflicts:
tgstation.dme
2015-05-10 14:48:35 +10:00
9c7b620d80
Adds lizard tail wagging, Modified sprite from Paradise's "Full of skittles"
2015-05-10 04:18:08 +01:00
09f71f7f94
removes the "whoops you're probably going to die by no fault of your own!" races from the staff/wand of change with a new var: dangerous_existence. Currently lists shadowpeople, shadowlings and plasmamen.
...
Additionally adds that protection to the change races summon events event so the entire station doesn't have a change of exploding into burning death skeletons with no hope for survival.
Adds plasmamen to the blacklist for slime mutation toxin.
2015-05-09 21:04:59 -04:00
4628bb7a15
Conflict resolution
...
With myself. I have internal demons.
2015-05-09 11:49:11 -05:00
7c9667db38
Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me
2015-05-09 11:40:44 -05:00
1875f3a9c2
Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
...
Group of fixes
2015-05-09 16:23:46 +02:00
7369992d3d
further reorganization, elimination of old defines folder
2015-05-09 23:16:57 +10:00
xxalpha
Cheridan
Firecage
GunHog
Martin Kemp
Razharas
Remie Richards
Jordie0608
Swag McYolosteinen
Fayrik
Cheridan
Xhuis
Incoming
Thunder12345
MrStonedOne
phil235