Cheridan
afd6b5fa22
Merge pull request #2266 from fleure/janradio
...
Gives janitor service headset
2014-01-07 08:37:24 -08:00
Cheridan
1a58a3cf86
Merge pull request #2265 from fleure/watertank
...
Reduced watertank slowdown slightly
2014-01-07 08:16:10 -08:00
Giacom
9602bd2c14
Merge pull request #2256 from Aranclanos/RRpls
...
Half of the runtimes of four days here
2014-01-07 06:24:57 -08:00
Cheridan
58159a00ad
Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
...
Poker tables
2014-01-06 14:35:03 -08:00
Giacom
a219896082
Merge pull request #2241 from ChuckTheSheep/explosiveoptimization
...
Explosion Optimizations
2014-01-06 13:07:05 -08:00
Fleure
c50255107a
Gives janitor service headset
2014-01-06 18:51:22 +00:00
Fleure
333d0ed045
Reduced watertank slowdown slightly
2014-01-06 18:26:06 +00:00
Aranclanos
233a5b3b9b
Fixes runtimes regarding using ointments/bruisepacks/surgery drapes while targeting eyes/mouth/groin or using them on other mobs.
2014-01-06 06:34:17 -03:00
Giacom
3c84e37160
Merge pull request #2235 from AndroidSFV/fix2221
...
Resolves #2221
2014-01-05 06:52:47 -08:00
Cheridan
bf9fa21ddc
Merge pull request #2149 from Miauw62/kittens
...
Kittens!!!! !!! !! !! !!!!!! !
2014-01-04 20:21:15 -08:00
Cheridan
e71314d4eb
Merge pull request #2199 from Perakp/buckleFix
...
Buckle fix
2014-01-04 19:51:59 -08:00
ChuckTheSheep
b3635a2935
small fixes
2014-01-04 20:03:22 -05:00
ChuckTheSheep
e71f98bbb8
Explosion Optimizations
...
Implements a trange that internally checks only turfs and thus less
intensive.
2014-01-04 19:29:17 -05:00
AndroidSFV
fe6f217d6f
Adds logging to emagged borgs using their stun arm.
2014-01-04 04:00:16 -06:00
Miauw
61ed6a5e15
Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2014-01-03 19:27:51 +01:00
Giacom
537b6ddba0
Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
...
Removes the gag ball.
2014-01-03 04:19:29 -08:00
Giacom
09da906881
Merge pull request #2187 from Tenebrosity/newradiofrequencycolours
...
Adds new radio frequency colours
2014-01-02 10:41:09 -08:00
Cheridan
3a11af405c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
...
Conflicts:
code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
Aranclanos
1e3f2c37a6
Removes the gag ball.
2014-01-01 23:43:01 -03:00
Cheridan
6c644f4652
Merge pull request #2185 from Cluwnes/itspersonnell
...
Those personnell were successfull.
2014-01-01 14:36:09 -08:00
Perakp
ac9228bae1
Added an else message to make it clear you can't unbuckle while buckled.
...
Refractored code to reduce copypasta.
2014-01-01 11:31:15 +02:00
fleure
be0f52b623
Fixed bruisepacks not working
2013-12-31 17:06:34 +00:00
Perakp
4f6eba7f6a
A proper fix for unbuckling while buckled.
2013-12-31 10:25:12 +02:00
Perakp
210a4c4d58
Now you can't unbuckle someone if you are buckled yourself.
...
This affects shuttlegriff and alien nesting the most.
2013-12-31 09:48:42 +02:00
Tenebrosity
b3d37e1d0a
Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum.
2013-12-31 16:50:17 +13:00
Cheridan
bb9c09df46
Obsoletes flags = FPRINT | TABLEPASS*
...
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.
Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.
If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Aranclanos
d5ddac3a00
Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
...
Cyber limbs fixes [FIXES #1920 ] + [Fixes #2180 ] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
Tenebrosity
e4b251a488
Adds different radio frequency colours for engineering, security, medical, service and supply.
2013-12-30 20:09:35 +13:00
Cluwnes Honk
a348534ab1
Personnelly, I feel this pull request was successfull.
...
Spelling fixes.
2013-12-29 15:54:50 -08:00
Robson Richards
d3d4c79946
Merges Heal_Damage and Heal_robotic_damage procs
...
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
Robson Richards
53bfd06609
Fixes #2180 - Augmented limb healing issues
2013-12-29 16:12:32 +00:00
Rockdtben
92636bbe01
Merge pull request #2168 from fleure/toolbox
...
Fixed toolbox parent object giving error
2013-12-29 08:00:11 -08:00
fleure
171147b1bf
Fixed toolbox parent object giving error
2013-12-28 14:51:35 +00:00
Cluwnes Honk
2482fd0702
Makes cards pocketable.
...
Adds w_classes to cards so you can actually pocket the things.
2013-12-27 15:49:21 -08:00
Miauw
f1376608eb
Added kittens and Proc, sprites by Nienhaus.
2013-12-27 15:44:40 +01:00
Cheridan
b9efeaa932
Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
...
Item name fixing round3
2013-12-26 23:14:15 -08:00
Cheridan
ef25332511
Merge pull request #2125 from Miauw62/ifitfeelsright
...
Folding boxes updates sprites properly
2013-12-26 20:13:09 -08:00
Miauw
0c8c6a5de2
Fixed #1119 folding boxes updates sprites properly
2013-12-22 19:21:45 +01:00
Miauw
0338a66c2a
Adds fingerprints to a bunch of stuff. De-texts computer build paths.
2013-12-22 18:57:33 +01:00
Kyrah Abattoir
df626a1f06
correct paint can names and plural status, corrected pill box names, corrected lockbox names.
2013-12-22 11:28:10 +01:00
Aranclanos
58d0ed5221
Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites
...
Security Sprite updates.
2013-12-21 15:24:14 -08:00
Aranclanos
f00c80bd43
Merge pull request #2104 from Giacom/gulag_therevenge
...
[MAP] The Gulag: The Revenge: Part 2.5
2013-12-21 15:05:57 -08:00
Aranclanos
e7579e2aa8
Merge pull request #1986 from Perakp/janitorCartFix
...
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
Giacom
516ec6076d
Merge pull request #2102 from Razharas/Flamethrower
...
Fixes flamethrowers shooting through stuff
2013-12-21 13:57:33 -08:00
Giacom
5fb0d05dd1
Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou
...
Small fixes for Linda.
2013-12-21 13:57:15 -08:00
Giacom
9d24a900ae
Merge pull request #2066 from Perakp/slipFix4
...
No slipping when lying down
2013-12-21 13:54:39 -08:00
Giacom
90ecfcbc4b
Merge pull request #2063 from Nienhaus/master
...
Posters
2013-12-21 13:37:20 -08:00
Robson Richards
9dd0432697
Implements Gia's Superior Idea.
...
fixes some directions on Nienhaus's sprites
2013-12-21 20:09:52 +00:00
Robson Richards
b8d8975fe6
Fixes Kaze's Suggestion
...
Standardises the fuck out of Table attackby's (NO COPYPASTA ANYMORE YAY)
Adds a new proc which does the above.
2013-12-21 18:22:49 +00:00
Cheridan
e3f82955e4
Merge pull request #2080 from Razharas/no
...
Fixes morgue trays used by ghosts and what not
2013-12-21 01:12:04 -08:00
