Commit Graph

14295 Commits

Author SHA1 Message Date
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
KorPhaeron eedd50ac33 Fixes flag duping 2016-01-30 04:51:12 -06:00
KorPhaeron efb91fb10a Handslow 2016-01-30 04:30:55 -06:00
Chiefwaffles efa5d2577b Adds Slipocalypse Clusterbang for 2tc. 2016-01-30 00:58:51 -08:00
MMMiracles ea3e03ec48 adds a blue variant of the rifle for team-based stuff or something 2016-01-30 01:57:14 -05:00
Incoming d659a7d203 Fixes Super Obscure Spray Tan Bugs
Spray tan chem was ineffective on humans because they didn't call the proper update_icon to change the base skin layer.
Races with colors could get to fullblack with careful use of spray tanning
2016-01-30 01:28:21 -05: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
MMMiracles cb8e000580 adds instagib rifle 2016-01-30 01:24:56 -05:00
PKPenguin321 1b4b672af9 carrot shivs
git went rough on my ass and im not happy about it
2016-01-29 22:05:47 -08: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
xxalpha a880a4c666 Fix runtime with verb 2016-01-30 02:13:00 +00:00
bgobandit 859058f053 Mimes can now alter their mask to display different emotions. 2016-01-29 21:10:31 -05:00
erwgd cffdb3f684 Removes wheat-to-rice mutation 2016-01-30 02:09:56 +00:00
bgobandit 0a1a30f2a9 fixes razharas's dank meme 2016-01-29 20:30:46 -05:00
xxalpha 3df42cfdba Added new event: portal storm.
need the file of course

world name
2016-01-30 01:23:55 +00: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
PKPenguin321 fbac29339e calls my parents
they were getting lonely

ps i actually have no idea what this does it might break things
2016-01-29 16:43:20 -08:00
PKPenguin321 20e70de015 removes quality humor
comments are srs bisnis
2016-01-29 16:32:04 -08: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
AnturK 8999db80b4 Fixes shuttles loading improperly in templates
Adds template datum and preloader
2016-01-29 20:51:12 +01: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
Thunder12345 a546faefa0 Bugfix time 2016-01-29 16:50:24 +00:00
Nerd Lord e044655050 compile 2016-01-29 11:34:52 -05:00
Thunder12345 e7bdd092a5 Quick name fix 2016-01-29 15:27:48 +00:00
Thunder12345 f7de800392 Adds melee and ranged syndicate stormtroopers 2016-01-29 15:02:28 +00: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