Commit Graph

24890 Commits

Author SHA1 Message Date
KorPhaeron 578295cc6d Fixes spawn protection 2016-01-27 03:34:50 -06:00
Boredone 4eb671093d Messed up a bit on the first commit, doing this removed some compile errors. 2016-01-27 02:09:03 -07:00
Boredone c025c3c243 This commit switchs the teleport armor in the RD's Locker to the reactive/teleport child which causes radiation. 2016-01-27 01:47:24 -07:00
Boredone c5266a014c Ah, first commit. This makes a new child or Reactive Armor, reactive/teleport.
It is the same as normal reactive teleport armor, but radiates the one wearing it I'm pretty sure.
2016-01-27 01:44:36 -07:00
Bjorn Neergaard 5e2e295760 Fix wires swapping 2016-01-27 02:11:40 -06:00
Bjorn Neergaard d9162b653c Fix tgui recursion being broken
..() is more elegant after all... You win @RemieRichards
Fixes #14925
2016-01-27 00:52:22 -06:00
Kyle Spier-Swenson 22d408fd4b readds type checking to get_cloest_atom as apparently there are plans for that 2016-01-26 22:17:24 -08:00
Kyle Spier-Swenson dd48ad1650 Cleans up tesla code 2016-01-26 22:08:47 -08:00
hornygranny 5238365dbe MUH STANDARDS 2016-01-26 21:06:10 -08:00
hornygranny 610a3eef03 gotta go fast 2016-01-26 20:59:12 -08:00
Razharas 41a9a90947 Merge pull request #14921 from MrPerson/hud_garbage_collection
Make /datum/hud garbage collect correctly
2016-01-27 07:19:42 +03:00
xxalpha d9a7a55649 Fix some cases not detecting a corner wall.
Fixed it

Clean
2016-01-27 03:49:09 +00:00
Incoming 7eaca93499 Poly is now more impressionable from things he hears in person (in parrot) and will mimic the line 50% of the time (up from 20%)
Poly is now less impressionable from things he hears over the radio (the parrot) and will mimic the line 5% of the time (down from 20%)

Expands Poly's memory from 20 lines to 500 lines.
2016-01-26 22:36:15 -05:00
xxalpha 96ab63482a Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj 2016-01-27 03:35:05 +00:00
xxalpha 6133cccd79 Maps 2016-01-27 03:29:05 +00:00
duncathan salt 7cbf933d85 Merge pull request #14953 from MrStonedOne/patch-135
Fixes wires crashing everything.
2016-01-26 20:58:11 -06:00
Kyle Spier-Swenson 2db4f0f079 Update wires.dm 2016-01-26 18:48:10 -08:00
Kyle Spier-Swenson fcc4f02795 Update syndicatebomb.dm 2016-01-26 18:47:00 -08:00
xxalpha 388760d868 Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj 2016-01-27 02:38:36 +00:00
xxalpha 3d27a75c21 Instructions etc. 2016-01-27 02:33:57 +00:00
duncathan salt 2a0b89c951 Update cleanbot.dm 2016-01-26 20:33:33 -06:00
Razharas 95bdba5ef9 Merge pull request #14912 from ChangelingRain/comment
Blobs now have an animation when attacking a target
2016-01-27 05:16:53 +03:00
xxalpha d59e0c7866 Diagonal smoothing first commit 2016-01-27 02:04:17 +00:00
KorPhaeron 74db42953b Fixes victory 2016-01-26 19:28:12 -06:00
PKPenguin321 74f20f3fed allows switchblades too
still no bike horns, rip zilenan
2016-01-26 17:28:03 -08:00
tkdrg ea01db2011 Merge pull request #14833 from DrEVOPVP/nuke_op_name_fix
Fixes reinforcement Nukeops not getting the correct names.
2016-01-26 22:24:51 -03:00
Razharas 00769a5e92 Merge pull request #14908 from MrStonedOne/patch-132
Properly fixes power sinks
2016-01-27 04:17:47 +03:00
Razharas d110b5fc59 Merge pull request #14882 from ChangelingRain/superfailed
Actually fixes supermatter explosion to not be capped
2016-01-27 04:16:20 +03:00
Razharas e67012ef41 Merge pull request #14773 from ChangelingRain/punchy
Nerfs golem punch stun chances
2016-01-27 04:09:14 +03:00
Razharas f4db6dde16 Merge pull request #14765 from octareenroon91/patch-33
Why you gotta be so Mean(...)
2016-01-27 04:07:45 +03:00
Razharas d240bb49ef Merge pull request #14900 from KorPhaeron/mosin
Adds dirt cheap surplus rifles to the nuke op uplink
2016-01-27 04:05:11 +03:00
Razharas 3325776591 Merge pull request #14902 from neersighted/fun_removal
Resolve wire issues and remove difficult colors
2016-01-27 04:02:52 +03:00
Razharas 73e0ed38b2 Merge pull request #14896 from lzimann/pdapainterwrench
Makes you able to wrench PDA painters
2016-01-27 03:59:20 +03:00
Razharas c60e47526e Merge pull request #14879 from PKPenguin321/autoimplanter
Adds Autoimplanter for nuke ops
2016-01-27 03:57:05 +03:00
KorPhaeron c4f912d5cc Fixes team protection/scoring etc 2016-01-26 18:38:38 -06:00
Bjorn Neergaard fb309f862d Add feedback to uplink/uplink_item
A 'while I'm in here' thing
2016-01-26 18:22:02 -06:00
Kyle Spier-Swenson 9e33ca7cb9 Fixes minimaps crashing the server.
The list wasn't getting gc'ed until the proc ended, causing a fuck ton of lists to use up memory until it went over the memory limit
2016-01-26 16:08:21 -08:00
PKPenguin321 8672ac3bca Merge branch 'master' of https://github.com/tgstation/-tg-station into autoimplanter
# Conflicts:
#	icons/obj/device.dmi
2016-01-26 16:06:39 -08:00
Bjorn Neergaard 12784269e5 Fix random telecrystals and surplus crate runtime 2016-01-26 17:57:11 -06:00
Bjorn Neergaard 7dcdda8ed0 Disable tgui autoupdate for uplinks
Only a single person can use one at any given moment, and no
external factors update them
2016-01-26 17:46:03 -06:00
Bjorn Neergaard 4fd5c1a9ed Fix random item in the uplink 2016-01-26 17:17:02 -06:00
Bjorn Neergaard 838dd15e95 Fix syndie surplus crates 2016-01-26 17:14:05 -06:00
KorPhaeron b2f4b04fdf Lusty Xenomorph Maid 2016-01-26 17:08:44 -06:00
francinum 783f9d6fb9 Thin-high Restrictions 2016-01-26 16:58:39 -05:00
francinum 2c52d55e83 Gives Socks their gender restrictions back.
What I get for working with out of date files.
2016-01-26 16:53:07 -05:00
francinum 0824ddbbb6 Adds Neko Underwear
White and Black.
Sprites by Weedscopes/Chocobro
2016-01-26 16:37:56 -05:00
Bjorn Neergaard 194ab5b264 Remove unused mapping verb 2016-01-26 15:11:41 -06:00
Bjorn Neergaard d0f57701d9 Remove old define 2016-01-26 14:07:17 -06:00
PKPenguin321 a356825b42 fixes a case where held_knife wouldn't null after knife was removed
O N E   L I N E   C O M M I T S
N
E

L
I
N
E

C
O
M
M
I
T
S
2016-01-26 10:23:41 -08:00
Razharas 0486246927 Merge branch 'master' of https://github.com/tgstation/-tg-station into Assembly 2016-01-26 21:19:36 +03:00