c9aef1eb28
Merge pull request #15071 from Incoming5643/goof_creme
...
Fixes Super Obscure Spray Tan Bugs
2016-01-31 13:57:15 -03:00
2f9cf25120
Merge pull request #15000 from KorPhaeron/hat_buffs
...
Buffs cakehat
2016-01-31 13:45:55 -03:00
7891ac2805
Merge pull request #15034 from AnturK/shuttle_templates
...
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
1158d540de
Merge pull request #15058 from erwgd/BotanyToolsShakersForVendors
...
Added botany tools, salt and pepper shakers to vendors, changed how you get rice seeds
2016-01-31 13:23:21 -03:00
6b3e02e9be
Merge pull request #15056 from bgobandit/mimefeels
...
Mimes can now alter their mask to display different emotions.
2016-01-31 11:51:40 -03:00
94a138c2ad
Merge pull request #15057 from xxalpha/lowpowerverb
...
Fix runtime with new cyborg verb
2016-01-31 11:46:28 -03:00
da056af83f
Merge pull request #15018 from LanCartwright/fungaltbchange
...
removes fungal tb from traitor
2016-01-31 11:36:06 -03:00
40a2d8e6d1
no spaces, cycle proc, honk honk honk
2016-01-30 19:47:31 -05:00
11043a07f6
Adds scared mime mask and adjusts sad mime mask :(
2016-01-30 18:59:25 -05:00
170a87e69b
Alt-click and action button
2016-01-30 16:32:30 -05:00
062cb76e29
Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj
2016-01-30 19:45:45 +00:00
83a4491756
Space icon state function is a define.
2016-01-30 19:44:20 +00:00
43f9c228de
Merge pull request #15042 from ChangelingRain/swarmoverlays
...
Fixes a few things to use temporary overlays
2016-01-30 18:39:56 +00:00
a0f7d7afe1
Merge pull request #14999 from KorPhaeron/AI_buffs
...
AI upgrade software
2016-01-30 10:50:05 -03:00
841c4ad98c
Merge pull request #14958 from hornygranny/supermemersingularity
...
supermatter singularity throws mobs to itself
2016-01-30 10:39:40 -03:00
560e572ae7
Merge pull request #14997 from xxalpha/aistatus
...
Fixed AIs being stunnable
2016-01-30 08:35:07 -03:00
ae1d3ca202
Merge pull request #15030 from neersighted/tkui
...
Fix tgui tk checks
2016-01-30 08:02:33 -03:00
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
0c9217a9a5
Merge pull request #15026 from KazeEspada/GunHotFix
...
Fixes an unreported issue with guns.
2016-01-30 00:26:46 -06:00
fd8e1b5567
Refactor's gun firing.
2016-01-29 22:16:35 -07:00
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
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
60d3a23a2f
Do not negate the qdeleted call
2016-01-30 17:19:10 +13:00
18f71fb792
Merge pull request #15020 from optimumtact/patch-8
...
Mulebot buckle check improved
2016-01-30 01:04:50 -03:00
0ff42cb218
Merge pull request #14962 from Boredone/ReRadioactiveArmor
...
Radioactive Teleport Armor
2016-01-30 00:27:13 -03:00
329a234e4d
Spans and rework safety check
2016-01-30 16:05:08 +13:00
eeefec5e18
Merge pull request #15023 from MMMiracles/itsalwayspatriotsdayinamerica
...
Adds female patriotism (july in january edition)
2016-01-29 23:42:49 -03:00
e663e7232e
Merge pull request #15021 from Fox-McCloud/human-explosion-damage-refactor
...
Refactors Human Explosion Damage
2016-01-29 23:38:29 -03:00
b5e8f3a17f
update to readd can buckle var
2016-01-30 15:35:03 +13:00
a880a4c666
Fix runtime with verb
2016-01-30 02:13:00 +00:00
859058f053
Mimes can now alter their mask to display different emotions.
2016-01-29 21:10:31 -05:00
cffdb3f684
Removes wheat-to-rice mutation
2016-01-30 02:09:56 +00:00
40227ab0cf
conflicts??
2016-01-29 20:17:49 -05:00
d60904a2ae
conflict fix
2016-01-29 20:12:18 -05:00
bee7507676
Merge pull request #14987 from francinum/Nekowear
...
Adds Additional Underwear
2016-01-29 22:06:30 -03:00
d3765adbe0
Merge pull request #14988 from KorPhaeron/ctf
...
Shuffles CTF check order
2016-01-29 21:58:40 -03:00
e015f429f4
Merge pull request #15014 from xxalpha/bloodcrawlmove
...
Fixed bloodcrawl move setting loc to null.
2016-01-29 19:37:02 -03:00
e42e5d75f2
Merge pull request #14979 from xxalpha/lowpowerverb
...
Added a "no power" warning emote to cyborgs.
2016-01-29 19:34:06 -03:00
8999db80b4
Fixes shuttles loading improperly in templates
...
Adds template datum and preloader
2016-01-29 20:51:12 +01:00
a401975b0e
Fixes a few things to use temporary overlays
2016-01-29 14:02:41 -05:00
b1c3088ddb
Merge pull request #14608 from ChangelingRain/tacticruel
...
Tacticool jumpsuits aren't cool for protection
2016-01-29 21:30:28 +03:00
caa0130ecd
Merge pull request #14963 from neersighted/flat
...
Skin Rework
2016-01-29 21:23:11 +03:00
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
e044655050
compile
2016-01-29 11:34:52 -05:00
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
175d78d989
Fix tgui tk checks
...
Move to the proper distance check
2016-01-28 23:32:41 -06:00
7b1fdad8bc
Move changelog verb
2016-01-28 23:18:48 -06:00
221b6f5822
Properly set macros
2016-01-28 23:05:03 -06:00
068974590b
Finish skin cleanup
2016-01-28 23:03:36 -06:00
d18b510db5
Merge branch 'master' of https://github.com/tgstation/-tg-station into GunHotFix
2016-01-28 20:06:35 -07:00
tkdrg
bgobandit
xxalpha
Remie Richards
Incoming
duncathan salt
KazeEspada
oranges
erwgd
MMMiracles
AnturK
Nerd Lord
Razharas
Bjorn Neergaard