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
d5f927520d
Merge pull request #9422 from AnturK/borg_fix
...
Fixes increased borg battery drain
2015-05-09 22:17:25 +10:00
5f848a94eb
Fixes increased borg battery drain
2015-05-09 14:07:42 +02:00
67fe7dc25c
Merge pull request #9396 from Firecage/Nodropmutants
...
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-09 22:05:04 +10:00
a73ef787a2
Merge pull request #9380 from SconesC/spooky-faces
...
Replaces Plasmaman Gas Mask w/ Breath Mask
2015-05-09 22:03:34 +10:00
aafa80dcd8
Merge pull request #9378 from GunHog/diamond_tipped_spirals
...
Fixes the mining borg diamond drill upgrade
2015-05-09 21:45:21 +10:00
4e82cd9689
Merge pull request #9355 from Firecage/OverlaycleanBGone
...
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
279a2653c6
Merge pull request #9347 from SamuelRowe/master
...
Spelling and grammar fixes *FIXED*
2015-05-09 20:31:54 +10:00
da28ed2138
Merge pull request #9290 from AnturK/giant_enemy_crab
...
Adds resize variable for mobs
2015-05-09 20:29:55 +10:00
fdeb84021d
Merge pull request #9320 from GunHog/Botcall_V2
...
Bot performance and PDA features update
2015-05-09 06:26:19 +01:00
c77fefc937
Merge pull request #9374 from AnturK/abduction_third
...
Abduction fixes
2015-05-09 06:25:23 +01:00
14aa907252
Merge pull request #9407 from phil235/StaminaFix
...
Fixes stamina damage
2015-05-09 06:03:26 +01:00
3b98e4448d
Ports /vg/ DeityLink's new explosion effect, Blast doors are more resistant to explosions, Explosions can now take walls and doors into account (Cheaper than recursive explosions), Engine floors are more resistant to explosions.
2015-05-09 01:02:06 +01:00
155ddec1f4
Removes Mining Drill from voucher choices
...
- Removed mining drill from voucher choices
- Minor oversight fixed in rechargers.
2015-05-08 11:53:48 -05:00
24bc259d24
Fixes a runtime with headcrabs controled by non changeling players.
2015-05-08 17:56:59 +02:00
90724e6306
Adds resize variable for mobs
2015-05-08 17:28:19 +02:00
26df5b6c8e
Removes mining drill power mechanic.
...
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
489d076de5
Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
...
Fixes #9035 , atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
b5bbc6f1ef
Fixes aliens getting an exhaustion message.
...
Fixes nearly infinite loop when calling setStaminaLoss -> CHeckStamina -> SetStaminaLoss -> etc...
CheckStamina is now called in carbon/handle_status_effects instead of carbon/handle_regular_status_updates().
2015-05-08 15:37:40 +02:00
2febf4dacd
Merge pull request #9293 from xxalpha/cable_color
...
Engineering Cyborgs can now change their cable coil color.
2015-05-08 22:10:58 +10:00
f16c21e99f
Merge pull request #9252 from RemieRichards/MapGeneratorImprovements
...
Procedural Map Generator Improvements [Perfect for Merging/Porting]
2015-05-08 22:10:17 +10:00
e72a4fb580
Drop-Everything deletes NODROP items
2015-05-08 18:40:23 +10:00
0632b04eb4
fixes white crayons making nitrile gloves
2015-05-08 18:20:43 +10:00
Jordie
Remie Richards
Fayrik
xxalpha
Cheridan
Firecage
Cheridan
Xhuis
Incoming
Thunder12345
MrStonedOne
GunHog
phil235
AnturK
phil235