Commit Graph

23798 Commits

Author SHA1 Message Date
oranges 514b860fab Makes AI turrets better use the syndicate faction
Sets the faction to be syndicate, drones will now be targeted
2016-02-03 12:18:28 +13:00
tkdrg fbb207a61e Merge pull request #15110 from KorPhaeron/AI_fix2
Fixes surveillance software
2016-02-01 19:44:55 -03:00
tkdrg 0f47866cad Merge pull request #15122 from JJRcop/bugfixmoji
Fixes emoji issues to do with adminPM and OOC formatting
2016-02-01 19:44:16 -03:00
tkdrg 5884b160ae Merge pull request #15108 from bgobandit/boundname
Soulstones use real_name rather than name.
2016-02-01 19:41:03 -03:00
Cheridan c0211799d3 Merge pull request #15104 from bgobandit/blackslimefluff
Black slime fluff better accounts for lizards.
2016-02-01 15:17:57 -06:00
tkdrg a59e7fca43 Merge pull request #15102 from ChangelingRain/runeoverlay
Fixes runes appearing below cult floor glows
2016-02-01 00:01:52 -03:00
tkdrg f9885841f1 Merge pull request #15074 from Chiefwaffles/Slipocalypse
Adds Uplink Soap Clusterbang for 6TC
2016-02-01 00:01:33 -03:00
duncathan salt ccba4396b1 Merge pull request #15105 from KorPhaeron/fish
Makes Cayenne a proper carp, adds sentience potion to nuke op uplink
2016-01-31 20:52:00 -06:00
Chiefwaffles a4d5617289 Changed TC cost to 6. 2016-01-31 18:22:57 -08:00
tkdrg b10b9e18bc Merge pull request #15101 from bgobandit/fixpixels
Wirecutting posters removes any existing pixel shifts.
2016-01-31 22:44:19 -03:00
tkdrg 0d3e68c1d0 Merge pull request #15099 from PKPenguin321/patch-12
Dice of Fate -> Die of Fate
2016-01-31 22:20:05 -03:00
tkdrg 5e00afd4cc Merge pull request #14914 from PKPenguin321/is-that-a-knife-in-your-shoe-or-are-you-just-happy-to-OOF
Adds the ability to store knives/pens/edaggers in certain shoes
2016-01-31 22:00:43 -03:00
PKPenguin321 cdfefbf92b fixes travis
o n e    l i n e    c o m m i t s
2016-01-31 16:26:21 -08:00
tkdrg faa81107d6 Merge pull request #15079 from KorPhaeron/ctf_bugfix
CTF bugfixes and control point
2016-01-31 21:23:52 -03:00
KorPhaeron b56879d21e Parentheses 2016-01-31 18:16:05 -06:00
PKPenguin321 eeda4bbd04 updates var names, allows clown shoes to hold bike horns
zilenans around the globe, rejoice
2016-01-31 15:54:32 -08:00
PKPenguin321 616b24dda9 changes istype to is_type_in_list, adds a w_class check
also changes some var names to be less knife-specific and more item-specific
2016-01-31 15:52:11 -08:00
duncathan salt 52e60d80c9 Merge pull request #15089 from Firecage/atmos2modules
Take two of grouping the atmos files in modules.
2016-01-31 17:47:47 -06:00
KorPhaeron aed4a51223 Restores factions to being lists 2016-01-31 17:46:01 -06:00
tkdrg 90e4457bf2 Merge pull request #15087 from TrustyGun/eroticroleplay
Adds Gag Handcuffs
2016-01-31 20:41:48 -03:00
Razharas 652fe5ddee Merge pull request #15092 from tkdrg/yyyyyyy
[s]Fixes summoning orb exploit
2016-02-01 01:39:42 +03:00
tkdrg 5b74ac82d7 Merge pull request #15031 from Fayrik/riseofthemachines
Adds pAI Control to Simple Robots
2016-01-31 19:02:52 -03:00
Fayrik e199f81de2 This better be third time lucky. 2016-01-31 21:54:30 +00:00
tkdrg 013016d4f3 Merge pull request #14103 from bgobandit/valentinestuff
Adds valentines and candy hearts for Valentine's Day.
2016-01-31 18:49:28 -03:00
tkdrg 5fed23879f Merge pull request #15093 from ChangelingRain/blobbermaybe
Blobbernauts cost 30 resources
2016-01-31 18:42:42 -03:00
Fayrik 5548180158 Cardpulling works only once now, new proc, removed mulebot emag mode. 2016-01-31 21:12:50 +00:00
Remie Richards 0550e75804 Merge pull request #15039 from Thunder12345/stormtrooper
Adds Syndicate Stormtrooper mobs
2016-01-31 20:50:39 +00:00
Chiefwaffles 170b592377 Ups price to 4TC. Soap Spawnergrenade added to replace soap as payload. 2016-01-31 12:29:00 -08:00
tkdrg d27426a803 Merge pull request #15043 from KorPhaeron/doomsday
Fixes Doomsday device working off Z1
2016-01-31 17:09:00 -03:00
Remie Richards 8f3245282e Merge pull request #14944 from tkdrg/agoodideaforonce
adminmoreinfo links to antags in ahelp are now red
2016-01-31 19:58:24 +00:00
Remie Richards 7f7cfa1326 Merge pull request #14838 from tkdrg/stealthmin_improvement_improvement
Stealthmin will no longer make humans invisible
2016-01-31 19:58:13 +00:00
Fayrik 261796e6a7 The easy way works better. Whoops. 2016-01-31 19:41:08 +00:00
Fayrik a674179746 Now using attack logs for pai history. PAI to pAI. Removed unnecessary spacing on if statements. 2016-01-31 19:29:36 +00:00
TrustyGun 5bbb78024f Removed all instances of the handcuffs from the map and added them to the arcade machine 2016-01-31 14:15:44 -05:00
tkdrg 8c5f3ea143 Merge pull request #15012 from KorPhaeron/title_screen
Allows mappers to set their own title screen for each map
2016-01-31 15:14:17 -03:00
JJRcop ab99043d31 Fixes emoji issues to do with adminPM and OOC formatting 2016-01-31 12:57:43 -05:00
tkdrg 592b7884dd Merge pull request #15082 from AnturK/ssufix
Fixes #15080
2016-01-31 14:24:34 -03:00
tkdrg 80cb7880ed Merge pull request #15081 from Menshin/astar_passflags
Added passflags checking for A*
2016-01-31 14:11:02 -03:00
tkdrg 9d8275e6e8 Merge pull request #15078 from KorPhaeron/space_suit
Removes inhand slowdown from space suits
2016-01-31 13:58:48 -03:00
tkdrg c9aef1eb28 Merge pull request #15071 from Incoming5643/goof_creme
Fixes Super Obscure Spray Tan Bugs
2016-01-31 13:57:15 -03:00
tkdrg 2f9cf25120 Merge pull request #15000 from KorPhaeron/hat_buffs
Buffs cakehat
2016-01-31 13:45:55 -03:00
tkdrg 7891ac2805 Merge pull request #15034 from AnturK/shuttle_templates
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
tkdrg 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
AnturK 5a8baf4bec Better loop in object subsystem 2016-01-31 17:03:26 +01:00
tkdrg 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
tkdrg 94a138c2ad Merge pull request #15057 from xxalpha/lowpowerverb
Fix runtime with new cyborg verb
2016-01-31 11:46:28 -03:00
tkdrg da056af83f Merge pull request #15018 from LanCartwright/fungaltbchange
removes fungal tb from traitor
2016-01-31 11:36:06 -03:00
KorPhaeron 5c8b8b8148 Red shields for red hardsuits 2016-01-31 04:32:40 -06:00
KorPhaeron afc0e1e4c6 Capture the Flag fixes and control point 2016-01-31 04:20:35 -06:00
TrustyGun f6c1b49af0 Best of both sides 2016-01-31 03:02:54 -05:00