Commit Graph

13853 Commits

Author SHA1 Message Date
tkdrg b10b9e18bc Merge pull request #15101 from bgobandit/fixpixels
Wirecutting posters removes any existing pixel shifts.
2016-01-31 22:44:19 -03:00
KorPhaeron b839423c63 Adds fire sound 2016-01-31 18:17:08 -06: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
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
tkdrg 5fed23879f Merge pull request #15093 from ChangelingRain/blobbermaybe
Blobbernauts cost 30 resources
2016-01-31 18:42:42 -03:00
xxalpha 87abdca865 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-01-31 21:12:18 +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
KazeEspada 9980018b2a Storage items now drop loot upon destruction.
Lockboxes can now be blown open.
2016-01-31 13:01:36 -07:00
Mike Long 4854d6eed6 Pipe Suicide now deals oxygen AND brute loss. 2016-01-31 14:54:32 -05: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
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 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
Mike Long 9eb8b8b770 Removes whitespace and fixes grammar. 2016-01-31 10:12:45 -05:00
tkdrg da056af83f Merge pull request #15018 from LanCartwright/fungaltbchange
removes fungal tb from traitor
2016-01-31 11:36:06 -03:00
Mike Long 3144a6e7f4 Added a new suicide act for pipe valves. 2016-01-31 09:13:21 -05:00
KorPhaeron e8e07a497f New malf objectives 2016-01-31 03:41:01 -06:00
TrustyGun f6c1b49af0 Best of both sides 2016-01-31 03:02:54 -05:00
KorPhaeron 893863daa4 AI Fix 2016-01-31 00:00:04 -06:00
Incoming 902f0ab492 Makes the wild shapeshift spell slightly less terrible.
You can choose your form (once) now instead of getting random corgi-d. The forms themselves have been shuffled a bit for usefulnessL
* Mouse (small hitbox and vent crawling
* Chaos Magicarp (a riskier chaos staff)
* Ed209 (STUNS FOR DAYS YO)
* Juggernaut (Walling, wallpunching)
* Corgi (Meme, hats)
2016-01-31 00:48:53 -05:00
bgobandit 9948e63305 Soulstones use real_name rather than name. 2016-01-31 00:39:25 -05:00
Nerd Lord 3fe3c4df30 Fixes runes appearing below cult floor glows 2016-01-30 21:53:29 -05:00
bgobandit 32f862d7c6 Wirecutting posters removes any existing pixel shifts. 2016-01-30 21:47:09 -05:00
KazeEspada d78936e184 You can now blow open secure storage containers such as digital safes, locked briefcases, etc. 2016-01-30 19:01:55 -07:00
Fayrik b9162fbb3e Tweaked card ejection slightly. 2016-01-31 00:25:51 +00:00
Nerd Lord ef88b0fe6e Blobbernauts cost 30 resources 2016-01-30 16:07:09 -05:00
Tkdrg 05b7ddb14b Fixes summoning orb exploit 2016-01-30 17:46:11 -03:00
xxalpha 062cb76e29 Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj 2016-01-30 19:45:45 +00:00
xxalpha 83a4491756 Space icon state function is a define. 2016-01-30 19:44:20 +00:00
Akke f0ef994da6 adds a nerf too
removes box
2016-01-30 19:42:13 +00:00
Firecage 6e27893e38 Take to of grouping the atmos files in modules. 2016-01-30 21:09:38 +02:00
Remie Richards 43f9c228de Merge pull request #15042 from ChangelingRain/swarmoverlays
Fixes a few things to use temporary overlays
2016-01-30 18:39:56 +00:00
TrustyGun e182cf0f2e Makes it more clearer these are meant for pranks 2016-01-30 12:18:21 -05:00
TrustyGun 6f63e74f34 Adds Gag Handcuffs
They act like regular handcuffs, but you can break out of them in only a
second. One spawns in the Captain's locker and the dorms.
2016-01-30 11:54:51 -05:00
AnturK 3c3395147e Fixes #15080 2016-01-30 14:51:02 +01:00
tkdrg a0f7d7afe1 Merge pull request #14999 from KorPhaeron/AI_buffs
AI upgrade software
2016-01-30 10:50:05 -03:00
AnturK 1cbb8137d9 Moves initialize from /atom/movable to /atom
Bit cleaner powernet/pipes initialization in templates
2016-01-30 14:34:34 +01:00
KorPhaeron 337f24d14f Moved to its own dm file 2016-01-30 07:29:19 -06:00
KorPhaeron 727db8a4f4 Some span classes and typo fixes 2016-01-30 07:12:58 -06:00
Menshin ca679f5da2 Added passflag checking for A*. 2016-01-30 13:51:52 +01:00
Chiefwaffles efa5d2577b Adds Slipocalypse Clusterbang for 2tc. 2016-01-30 00:58:51 -08:00
KorPhaeron 2549733a83 Adds eff station 2016-01-30 01:49:43 -06:00
KorPhaeron 10a154fad8 Merge remote-tracking branch 'refs/remotes/tgstation/master' into title_screen 2016-01-30 01:48:00 -06:00
KorPhaeron da6d81a49b Fixes chameleon projector immortality 2016-01-30 00:06:30 -06:00