Commit Graph

13433 Commits

Author SHA1 Message Date
Chiefwaffles
efa5d2577b Adds Slipocalypse Clusterbang for 2tc. 2016-01-30 00:58:51 -08: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
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
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
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
tkdrg
614ab6cd1c Merge pull request #14975 from KorPhaeron/cleanbot
Fixes cleanbot doubled messages
2016-01-28 18:33:25 -03:00
Boredone
f83bb4ca3c Removed the extra Var definition of reaction chance on the reactive/teleport armor, and changed the description on the base one. 2016-01-28 14:31:13 -07:00
tkdrg
884091ca54 Merge pull request #14922 from PKPenguin321/patch-9
makes paper bins use incapacitated() instead of a massive if()
2016-01-28 18:29:23 -03:00
Razharas
8c0694463e Merge pull request #14853 from RemieRichards/MechaPilots
Mecha pilots!
2016-01-29 00:28:14 +03:00
tkdrg
767132b1c9 Merge pull request #14924 from PKPenguin321/patch-10
fixes up some helmets
2016-01-28 18:27:46 -03:00
Razharas
90fc9a8aad Merge pull request #15005 from neersighted/tgui
Allow tgui input() to be 0, fix SMES components
2016-01-28 22:35:57 +03:00
Nerd Lord
2cce7c6c86 i'm awful at math 2016-01-28 13:16:41 -05:00
Bjorn Neergaard
b57d3bd4f2 Rip out serverside winsets
Note: need to re-add a few winsets for borg/human mode
2016-01-28 12:14:43 -06:00
Nerd Lord
d492db3e58 useful commit message here 2016-01-28 12:50:38 -05:00
Bjorn Neergaard
f93822c195 Allow tgui input() to be 0, fix SMES components
Fixes #14965
2016-01-28 07:10:37 -06:00
KorPhaeron
77330ccd1f Shuttle Launch 2016-01-27 23:17:55 -06:00