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
eedd50ac33
Fixes flag duping
2016-01-30 04:51:12 -06:00
efb91fb10a
Handslow
2016-01-30 04:30:55 -06:00
efa5d2577b
Adds Slipocalypse Clusterbang for 2tc.
2016-01-30 00:58:51 -08:00
2549733a83
Adds eff station
2016-01-30 01:49:43 -06:00
10a154fad8
Merge remote-tracking branch 'refs/remotes/tgstation/master' into title_screen
2016-01-30 01:48:00 -06:00
ea3e03ec48
adds a blue variant of the rifle for team-based stuff or something
2016-01-30 01:57:14 -05: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
cb8e000580
adds instagib rifle
2016-01-30 01:24:56 -05:00
da6d81a49b
Fixes chameleon projector immortality
2016-01-30 00:06:30 -06:00
1b4b672af9
carrot shivs
...
git went rough on my ass and im not happy about it
2016-01-29 22:05:47 -08: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
b50c2cc910
Merge pull request #14994 from MrStonedOne/patch-138
...
Adds a 1 second delay to initializing the MC.
2016-01-30 01:18:41 -03: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
8c85f520bc
Merge pull request #15019 from PKPenguin321/patch-11
...
fixes this easy as shit bug
2016-01-29 23:39:16 -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
b2688de3a2
Merge pull request #15022 from optimumtact/adminsgettingspammedtheymightbanus
...
Don't message admins when a grenade goes bang
2016-01-29 23:32:25 -03:00
a880a4c666
Fix runtime with verb
2016-01-30 02:13:00 +00:00
ac535a3053
Adds salt and pepper to Kitchen vendor, adds botany tools to nutrimax, adds rice seeds to seeds vendor
2016-01-30 02:11:29 +00:00
859058f053
Mimes can now alter their mask to display different emotions.
2016-01-29 21:10:31 -05:00
e0b9182f96
Adds rice seed to seeds supply crate
2016-01-30 02:10:30 +00:00
cffdb3f684
Removes wheat-to-rice mutation
2016-01-30 02:09:56 +00:00
0a1a30f2a9
fixes razharas's dank meme
2016-01-29 20:30:46 -05:00
06dbea0d5f
Merge remote-tracking branch 'upstream/master' into blueprintsarea
2016-01-30 01:29:26 +00:00
e3670adb02
area/setup()
2016-01-30 01:28:44 +00:00
3df42cfdba
Added new event: portal storm.
...
need the file of course
world name
2016-01-30 01:23:55 +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
18fe39aaf3
Merge pull request #15009 from MrStonedOne/patch-141
...
Removed atom movable Del() proc override
2016-01-29 21:59:46 -03:00
d3765adbe0
Merge pull request #14988 from KorPhaeron/ctf
...
Shuffles CTF check order
2016-01-29 21:58:40 -03:00
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
1766296007
Detachment fix
...
Detaching medigun now properly shuts it down
2016-01-29 18:40:59 -06:00
20e70de015
removes quality humor
...
comments are srs bisnis
2016-01-29 16:32:04 -08:00
e015f429f4
Merge pull request #15014 from xxalpha/bloodcrawlmove
...
Fixed bloodcrawl move setting loc to null.
2016-01-29 19:37:02 -03:00
41fd32f91e
Merge pull request #15003 from MrStonedOne/patch-140
...
[s]Fixes locate exploit in datum/topic_input
2016-01-29 19:36:37 -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
450251b2cb
Doomsday
2016-01-29 13:24:22 -06:00
7feff1605f
get turf not loc
2016-01-29 14:12:17 -05:00
a401975b0e
Fixes a few things to use temporary overlays
2016-01-29 14:02:41 -05:00
tkdrg
KorPhaeron
Chiefwaffles
MMMiracles
Incoming
duncathan salt
PKPenguin321
KazeEspada
oranges
xxalpha
erwgd
bgobandit
GunHog
AnturK
Nerd Lord