9b8abb39ff
Merge pull request #9441 from Thunder12345/yousawnothing
...
Removes duplicate armoralt state in suit.dmi
2015-05-13 19:44:49 +10:00
0cd687531e
Merge pull request #9429 from Xhuis/changelingRevivalFix
...
Fixes revival stasis sometimes not displaying confirmation popup when alive
2015-05-13 19:43:00 +10:00
6fa613c858
Merge pull request #9415 from RemieRichards/uniqueListOptimise
...
Optimises uniqueList()
2015-05-13 19:42:09 +10:00
d5be3018c1
Merge pull request #9353 from Firecage/Pickupverb
...
Allows you to pick up stuff with the verb while buckled.
2015-05-13 19:41:53 +10:00
520cf04121
Merge pull request #9346 from Incoming5643/slam_jammed
...
Adds a missing victory condition for noncontinuous nuke ops
2015-05-13 19:41:25 +10:00
67bfcfbc1d
Merge pull request #9328 from Xhuis/autolatheItemFix
...
Fixes autolathe accepting borg modules
2015-05-11 09:40:35 -05:00
31b4d60d98
Merge pull request #9383 from Xhuis/cultCommFix
...
Fixes constructs not having correct cult communications
2015-05-11 09:32:26 -05: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
13c38fc456
Merge pull request #9421 from Incoming5643/EvenMoreValidPrivilage
...
Rolling for antag at roundstart grants popcap immunity
2015-05-11 08:21:36 -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
765ae6613a
Merge pull request #9404 from Incoming5643/EdgyMully
...
Fixes a blob edge case
2015-05-11 06:19:23 -05:00
0b446674a0
Cleans up the checks to just an unEquip check
2015-05-10 13:42:27 -04:00
7e73408ce1
Renames + does some other stuff.
2015-05-10 13:29:57 -04:00
376ac27cf2
Improves/renames epinephrine overdose
2015-05-10 12:24:12 -04:00
bf29f46f57
Removes duplicate armoralt state in suit.dmi
2015-05-10 16:52:32 +01:00
bd12598404
Merge pull request #9376 from spasticVerbalizer/stackingFalseWalls
...
Adds check to prevent false wall stacking, fixes #6449
2015-05-11 00:07:11 +10:00
040fd7d8b7
Change uses of 'usr' to 'user', move checking of wall up so the message actually shows
2015-05-10 13:31:10 +02: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
1ec83a0ab0
Fixes revive stasis sometimes not working
2015-05-09 16:09:30 -04:00
bd2a60495a
Merge pull request #9367 from Incoming5643/ettuwizards
...
That damn wizard life check again
2015-05-09 14:01:21 -05:00
087365e763
src.contents to src.loc.contents
2015-05-09 20:49:44 +02:00
72169da31f
Merge pull request #9409 from GunHog/The_Machine_Spirit_Sings_To_Me
...
Removes mining drill power mechanic.
2015-05-09 19:38:17 +02:00
36be3b6983
Merge pull request #9110 from Xhuis/double_cannons
...
Adds the Pneumatic Cannon
2015-05-09 12:00:45 -05:00
faf6bff92c
Typecheck for turf being a wall, look in contents rather than loc.
2015-05-09 18:58:30 +02: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
4e787fb980
Merge pull request #9358 from Firecage/Weldersprites
...
New welder sprites and welder name, Fix experimental welder.
2015-05-09 11:26:32 -05:00
1875f3a9c2
Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
...
Group of fixes
2015-05-09 16:23:46 +02:00
edfd3b8bef
fixes message monitor unable to decon when broken and unneeded emag var
2015-05-09 23:53:06 +10:00
f5d4a53bdc
Merge pull request #9389 from Ikarrus/gangpointmax
...
Increased Influence Cap for gangs
2015-05-09 22:28:19 +10:00
d5f927520d
Merge pull request #9422 from AnturK/borg_fix
...
Fixes increased borg battery drain
2015-05-09 22:17:25 +10:00
9387af3587
Merge pull request #9403 from francinum/patch-1
...
Span Closure
2015-05-09 22:12:04 +10:00
5f848a94eb
Fixes increased borg battery drain
2015-05-09 14:07:42 +02:00
17a4858318
Merge pull request #9400 from xxalpha/spacehulks
...
Hulks can now break windoors.
2015-05-09 22:05:36 +10: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
b6748e510a
Merge pull request #9372 from Firecage/emaggedwindoors
...
Fixes emagged windoors
2015-05-09 21:44:49 +10:00
54bcdb1b78
Merge pull request #9354 from Firecage/NoAIBuckling
...
Prevents an AI from being buckled.
2015-05-09 21:35:52 +10:00
4e82cd9689
Merge pull request #9355 from Firecage/OverlaycleanBGone
...
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
a1cb29fc1b
Merge pull request #9331 from Thunder12345/deouija
...
Severs cryo's connection to the spirit world
2015-05-09 21:14:19 +10:00
45b76d4a26
Merge pull request #9337 from xxalpha/ash
...
Fixed a couple of small problems with smoking pipes.
2015-05-09 20:33:00 +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
7d90ec14ef
Fixes a very edgy case where if a server was running up against a hard or extreme population cap it could theoretically reject someone already selected to be an antagonist, which could lead to all sorts of oddities.
...
Not a pressing issue on tgstation servers, as the hard and extreme pop caps exist at higher levels than either server pull on even the highest of traffic days (or they're just off)
Note that this check isn't relevent for late join antagonists, they roll for antag after spawning on the station, you couldn't just mash the join button until you managed to roll for antag.
2015-05-09 02:50:19 -04: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
Jordie