Commit Graph

23644 Commits

Author SHA1 Message Date
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
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
8c85f520bc Merge pull request #15019 from PKPenguin321/patch-11
fixes this easy as shit bug
2016-01-29 23:39:16 -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
tkdrg
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
xxalpha
06dbea0d5f Merge remote-tracking branch 'upstream/master' into blueprintsarea 2016-01-30 01:29:26 +00:00
xxalpha
e3670adb02 area/setup() 2016-01-30 01:28:44 +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
18fe39aaf3 Merge pull request #15009 from MrStonedOne/patch-141
Removed atom movable Del() proc override
2016-01-29 21:59:46 -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
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
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
b124302e47 Merge pull request #15011 from ChangelingRain/passtheblob
Blobs use canpass to check if they can expand instead of a density check
2016-01-29 21:27:47 +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
966ccd0921 literally a style change 2016-01-29 11:38:05 -05: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
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
oranges
34bdee117d Don't message admins when a grenade goes bang
Keeps it in the game log though (for investigations)
2016-01-29 01:32:30 +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
PKPenguin321
8e23924edc fixes this easy as shit bug
fuck git
2016-01-28 17:11:54 -08: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
776598f1f6 Merge pull request #14974 from KorPhaeron/slaughter
Clarifies slaughter demon event comments
2016-01-28 20:47:21 -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
tkdrg
45659129d3 Merge pull request #14919 from KorPhaeron/remove_grab10
Removes grab from bins
2016-01-28 20:24:59 -03:00
KorPhaeron
005540a9cc Timer 2016-01-28 17:15:28 -06: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
0dda9b993b Merge pull request #14930 from Shadowlight213/Janiborglightbuff
Greatly decreases janiborg light replacer refill time.
2016-01-28 19:30:16 -03:00
Razharas
4df135e073 Merge pull request #15001 from xxalpha/cameranew
Fixed camera/New().
2016-01-29 01:27:22 +03: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
38ffa0d9a0 Merge pull request #14973 from KorPhaeron/abductor
Lizard nerfs
2016-01-28 18:53:39 -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
f56d09a859 Merge pull request #14968 from MrStonedOne/patch-136
Fixes minimap caching
2016-01-28 18:50:20 -03:00
tkdrg
748331b4d1 Merge pull request #14978 from KorPhaeron/alien_surgery
Fixes alien surgery
2016-01-28 18:47:34 -03:00
tkdrg
614ab6cd1c Merge pull request #14975 from KorPhaeron/cleanbot
Fixes cleanbot doubled messages
2016-01-28 18:33:25 -03:00
tkdrg
592ee7dbd3 Merge pull request #14976 from KorPhaeron/chairs
Fixes being unable to unbuckle people
2016-01-28 18:32:56 -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