xxalpha
|
062cb76e29
|
Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj
|
2016-01-30 19:45:45 +00:00 |
|
xxalpha
|
83a4491756
|
Space icon state function is a define.
|
2016-01-30 19:44:20 +00:00 |
|
Remie Richards
|
43f9c228de
|
Merge pull request #15042 from ChangelingRain/swarmoverlays
Fixes a few things to use temporary overlays
|
2016-01-30 18:39:56 +00:00 |
|
tkdrg
|
a0f7d7afe1
|
Merge pull request #14999 from KorPhaeron/AI_buffs
AI upgrade software
|
2016-01-30 10:50:05 -03:00 |
|
tkdrg
|
841c4ad98c
|
Merge pull request #14958 from hornygranny/supermemersingularity
supermatter singularity throws mobs to itself
|
2016-01-30 10:39:40 -03:00 |
|
tkdrg
|
560e572ae7
|
Merge pull request #14997 from xxalpha/aistatus
Fixed AIs being stunnable
|
2016-01-30 08:35:07 -03:00 |
|
tkdrg
|
ae1d3ca202
|
Merge pull request #15030 from neersighted/tkui
Fix tgui tk checks
|
2016-01-30 08:02:33 -03:00 |
|
duncathan salt
|
0c9217a9a5
|
Merge pull request #15026 from KazeEspada/GunHotFix
Fixes an unreported issue with guns.
|
2016-01-30 00:26:46 -06:00 |
|
KazeEspada
|
fd8e1b5567
|
Refactor's gun firing.
|
2016-01-29 22:16:35 -07:00 |
|
tkdrg
|
8f0e610de6
|
Merge pull request #15024 from optimumtact/spideralert
Change spider ghost alert to an in chat one
|
2016-01-30 01:26:34 -03:00 |
|
tkdrg
|
41fd154e3f
|
Merge pull request #14996 from KorPhaeron/white_ship
Allows you to use the abandoned white ship as an escape shuttle
|
2016-01-30 01:25:40 -03:00 |
|
oranges
|
60d3a23a2f
|
Do not negate the qdeleted call
|
2016-01-30 17:19:10 +13:00 |
|
tkdrg
|
18f71fb792
|
Merge pull request #15020 from optimumtact/patch-8
Mulebot buckle check improved
|
2016-01-30 01:04:50 -03:00 |
|
tkdrg
|
0ff42cb218
|
Merge pull request #14962 from Boredone/ReRadioactiveArmor
Radioactive Teleport Armor
|
2016-01-30 00:27:13 -03:00 |
|
oranges
|
329a234e4d
|
Spans and rework safety check
|
2016-01-30 16:05:08 +13:00 |
|
tkdrg
|
eeefec5e18
|
Merge pull request #15023 from MMMiracles/itsalwayspatriotsdayinamerica
Adds female patriotism (july in january edition)
|
2016-01-29 23:42:49 -03:00 |
|
tkdrg
|
e663e7232e
|
Merge pull request #15021 from Fox-McCloud/human-explosion-damage-refactor
Refactors Human Explosion Damage
|
2016-01-29 23:38:29 -03:00 |
|
oranges
|
b5e8f3a17f
|
update to readd can buckle var
|
2016-01-30 15:35:03 +13:00 |
|
MMMiracles
|
40227ab0cf
|
conflicts??
|
2016-01-29 20:17:49 -05:00 |
|
MMMiracles
|
d60904a2ae
|
conflict fix
|
2016-01-29 20:12:18 -05:00 |
|
tkdrg
|
bee7507676
|
Merge pull request #14987 from francinum/Nekowear
Adds Additional Underwear
|
2016-01-29 22:06:30 -03:00 |
|
tkdrg
|
d3765adbe0
|
Merge pull request #14988 from KorPhaeron/ctf
Shuffles CTF check order
|
2016-01-29 21:58:40 -03:00 |
|
tkdrg
|
e015f429f4
|
Merge pull request #15014 from xxalpha/bloodcrawlmove
Fixed bloodcrawl move setting loc to null.
|
2016-01-29 19:37:02 -03:00 |
|
tkdrg
|
e42e5d75f2
|
Merge pull request #14979 from xxalpha/lowpowerverb
Added a "no power" warning emote to cyborgs.
|
2016-01-29 19:34:06 -03:00 |
|
Nerd Lord
|
a401975b0e
|
Fixes a few things to use temporary overlays
|
2016-01-29 14:02:41 -05:00 |
|
Razharas
|
b1c3088ddb
|
Merge pull request #14608 from ChangelingRain/tacticruel
Tacticool jumpsuits aren't cool for protection
|
2016-01-29 21:30:28 +03:00 |
|
Razharas
|
caa0130ecd
|
Merge pull request #14963 from neersighted/flat
Skin Rework
|
2016-01-29 21:23:11 +03:00 |
|
Razharas
|
ad5172a839
|
Merge pull request #14989 from ChangelingRain/holoclarity
Holoparasites have a health hud display for the summoner's health
|
2016-01-29 20:20:25 +03:00 |
|
Nerd Lord
|
e044655050
|
compile
|
2016-01-29 11:34:52 -05:00 |
|
xxalpha
|
63e9095345
|
Added a cyborg emote available when the cyborg has no charge.
in
Changed message
now a verb
|
2016-01-29 14:49:26 +00:00 |
|
Bjorn Neergaard
|
175d78d989
|
Fix tgui tk checks
Move to the proper distance check
|
2016-01-28 23:32:41 -06:00 |
|
Bjorn Neergaard
|
7b1fdad8bc
|
Move changelog verb
|
2016-01-28 23:18:48 -06:00 |
|
Bjorn Neergaard
|
221b6f5822
|
Properly set macros
|
2016-01-28 23:05:03 -06:00 |
|
Bjorn Neergaard
|
068974590b
|
Finish skin cleanup
|
2016-01-28 23:03:36 -06:00 |
|
KazeEspada
|
d18b510db5
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into GunHotFix
|
2016-01-28 20:06:35 -07:00 |
|
KazeEspada
|
a92fc67631
|
Fixes an unreported issue with guns that allowed them to fire even if failing can_shoot(). Fixes the ability for clumsy xeno, hulks trained in the ways of the sleeping carp to still shoot themselves in the foot with an abductor gun.
|
2016-01-28 19:56:44 -07:00 |
|
oranges
|
d103d6c648
|
Change spider ghost alert to an in chat one
This could actually benefit from a nice subystem to handle it (calling humanize_from_ghost) on the appropriate atom when the user clicks the link
|
2016-01-29 15:42:05 +13:00 |
|
xxalpha
|
ad06f18769
|
pls
|
2016-01-29 01:50:02 +00:00 |
|
xxalpha
|
4701d31b46
|
Merge remote-tracking branch 'upstream/master' into aistatus
|
2016-01-29 01:49:21 +00:00 |
|
oranges
|
0b02eba1e8
|
Mulebot buckle check improved
It makes sure you are buckled in before actually setting you as the loaded item/passenger
|
2016-01-29 01:37:33 +00:00 |
|
Fox-McCloud
|
401f2b84ff
|
Refactors Human Explosion Damage
|
2016-01-28 20:22:10 -05:00 |
|
MMMiracles
|
5f5e664478
|
quickly adds uk and commie before anyone notices
|
2016-01-28 20:21:30 -05:00 |
|
MMMiracles
|
06500d02a8
|
adds female variant of patriotic underwear.
|
2016-01-28 19:50:06 -05:00 |
|
Razharas
|
0826128459
|
Merge pull request #14698 from Firecage/absolutepathsandifs
Absolute paths and changes one liner if's/else's/else if's.
|
2016-01-29 03:15:12 +03:00 |
|
tkdrg
|
a5c3e3a746
|
Merge pull request #14888 from KorPhaeron/RED_UNZ_GO_FASTA
Red xenobio paint now works on vehicles
|
2016-01-28 20:38:15 -03:00 |
|
KorPhaeron
|
7e0fb61c1e
|
Adds spaces to return ..()
|
2016-01-28 16:38:37 -06:00 |
|
xxalpha
|
767c751f74
|
Fixed bloodcrawl move setting loc to null.
forcemobe
|
2016-01-28 22:34:34 +00:00 |
|
tkdrg
|
9ac73a85f8
|
Merge pull request #14702 from tgstation/RemieRichards-callproc-improvement
callproc now outputs the contents of returned lists instead of /list
|
2016-01-28 18:57:13 -03:00 |
|
tkdrg
|
e49a0877b5
|
Merge pull request #14964 from Jordie0608/firsticonsideredfancysqlthendecidedonasimplermethodwhichidiscoveredalreadyexisted
Fixes date change failing log ftp
|
2016-01-28 18:52:42 -03:00 |
|
xxalpha
|
d31789fde4
|
A whole commit for one blank line.
|
2016-01-28 21:34:05 +00:00 |
|