Aranclanos
a135f12e3f
Merge pull request #11990 from optimumtact/patch-1
...
Comment war continues
2015-09-27 17:31:48 -03:00
Razharas
b7a9cecff7
Merge pull request #12010 from phil235/TransformStingFix
...
Fixes transformation sting not giving the new name to the target.
2015-09-27 04:10:56 +03:00
Razharas
7425b4bb24
Merge branch 'master' of https://github.com/tgstation/-tg-station into SoundProblem
2015-09-26 17:08:09 +03:00
Razharas
b6e4ef88ec
Saving the data collecting
...
Saving the data collecting
2015-09-25 22:52:30 +03:00
Razharas
df189498ce
The final solution of bad taste in midis question
...
The final solution of bad taste in midis question
Added special client verb that kills all sounds currently playing for
this client
This is better because toggle midis only pauses them, not actually stops
them
2015-09-25 22:42:24 +03:00
c0
03e1bcfd2b
Inert hivelord core is still useful for surgery
2015-09-25 22:37:42 +03:00
c0
feeb9ff7d2
Organs update 3
2015-09-25 22:26:15 +03:00
Razharas
3bf0f92a67
Merge pull request #11957 from xxalpha/airlocking
...
Fixed icon when emagging bolted airlock.
2015-09-25 22:06:18 +03:00
Razharas
d17f621389
Merge pull request #11972 from KorPhaeron/fix
...
Kitchen Spike Hotfix
2015-09-25 22:05:28 +03:00
KorPhaeron
76928b467b
Fixes var names
2015-09-25 12:25:51 -05:00
KorPhaeron
58c5404947
Fix
2015-09-25 12:22:29 -05:00
Razharas
d6b9c50ffd
Some minor fixes to firecages pr
...
Some minor fixes to firecages pr
2015-09-25 17:12:15 +03:00
Razharas
5054411439
Merge branch 'spacevinecontrollerevent' of https://github.com/Firecage/-tg-station into Firecage-spacevinecontrollerevent
2015-09-25 16:48:24 +03:00
Razharas
14d54d3ef2
Merge branch 'duncathan-hemanifolds'
2015-09-25 16:45:57 +03:00
Razharas
9d8cf0ffe9
Merge branch 'hemanifolds' of https://github.com/duncathan/-tg-station into duncathan-hemanifolds
2015-09-25 16:35:08 +03:00
phil235
bc28e359ab
Fixes transformation sting not giving the new name to the target.
2015-09-25 11:51:59 +02:00
Razharas
b9b8734b74
Merge pull request #11966 from MMMiracles/dwarfsman
...
Dwarfism
2015-09-25 12:18:52 +03:00
Aranclanos
e4a2745723
Merge pull request #11975 from Iamgoofball/patch-123
...
Removes very dumb song references from the fox descriptions
2015-09-25 06:03:11 -03:00
Cheridan
e1b16b057c
Merge pull request #11964 from Delimusca/durrymunchin
...
ease-of-use smoking improvements
2015-09-24 22:26:22 -05:00
Razharas
0f5917b42d
Merge pull request #11889 from Xhuis/fuck_you_thomas_laser
...
New changeling power; tweaks to fleshmend/last resort
2015-09-25 04:24:38 +03:00
MMMiracles
1c130c03fe
insert 'too-short' joke
2015-09-24 21:07:44 -04:00
Razharas
7c757a735f
Merge pull request #11968 from xxalpha/hot_or_not
...
Removed /proc/is_hot() && Removed /proc/is_sharp()
2015-09-25 04:02:52 +03:00
Xhuis
1b7235f780
Makes fleshmend nerfs actually work
2015-09-24 20:27:57 -04:00
oranges
4ba7259666
Comment war continues
...
shake it off
2015-09-25 09:05:22 +12:00
Razharas
40e97a5f7b
Removes the fun
...
Removes the fun
2015-09-24 23:58:07 +03:00
Razharas
3c4994749b
Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction
2015-09-24 23:52:38 +03:00
Swag McYolosteinen
caf62582f2
Merge pull request #11980 from AnturK/eventfix
...
Event Fix
2015-09-24 19:13:22 +02:00
phil235
fd0b52f06c
Merge pull request #11920 from Jalleo/ImplantCleanup
...
Cleanup of base implant file and tiny change of my last merged PR
2015-09-24 14:43:21 +02:00
phil235
9c4ce72c8a
Merge pull request #11917 from feemjmeem/recharger-silicon-wrenchfix
...
Some gun recharger fixes
2015-09-24 14:34:11 +02:00
phil235
94b465399a
Merge pull request #11928 from Lijah99/ShadeAttackFix
...
Fixes shade attack text to be applicable to everything
2015-09-24 14:13:47 +02:00
phil235
f6508e03a1
Merge pull request #11605 from kingofkosmos/aisparksanddeademote
...
AI damage and dying indicators
2015-09-24 14:11:04 +02:00
AnturK
50db063df9
Event Fix
2015-09-24 12:29:25 +02:00
Iamgoofball
6a56d2a1ae
Removes very dumb song references from the fox descriptions
...
how did this make it past the great firewall of meme removal
2015-09-23 20:18:27 -07:00
xxalpha
f493bff99c
Fixed merge.
2015-09-24 03:26:52 +01:00
xxalpha
22474094ae
Merge remote-tracking branch 'upstream/master' into hot_or_not
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha
3d15d791fb
Merge branch 'edgy' into hot_or_not
...
Conflicts:
code/__HELPERS/unsorted.dm
2015-09-24 03:12:08 +01:00
xxalpha
deb60ae309
Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().
2015-09-24 03:08:28 +01:00
KorPhaeron
ce9ec8af68
Fixes mobs flipping updside down forever on spikes
2015-09-23 20:13:41 -05:00
xxalpha
655b1a77c7
Replaced refactored is_hot() to be an atom proc.
2015-09-24 01:12:38 +01:00
Razharas
7fbde15c51
Merge pull request #11934 from Lijah99/MechBuckleCheck
...
Adds a buckle check for entering mechs, works on all mobs
2015-09-24 02:14:40 +03:00
Razharas
d3aa84e978
Merge pull request #11937 from KorPhaeron/profligateslikeyoubelongonthecross
...
Hanging any mob from the kitchen spike
2015-09-24 02:14:06 +03:00
Razharas
99d8e089c4
Merge pull request #11913 from Xhuis/based_space_gods_this_no_smoking_sign_is_troubling_my_autism
...
Minor feature package
2015-09-24 02:12:23 +03:00
Razharas
5041f46bba
Merge pull request #11910 from Lijah99/RPD_true_suicide
...
Adds a suicide message for the RPD
2015-09-24 02:07:25 +03:00
Razharas
6ddb1bf1ce
Merge pull request #11904 from Miauw62/newposters
...
Removes the shitty red faction poster and replaces it with two new ones.
2015-09-24 02:06:52 +03:00
Razharas
1105a2b820
Merge pull request #11899 from kingofkosmos/altclickrotatepipe
...
Alt-click to rotate stuff
2015-09-24 01:59:04 +03:00
Razharas
4a99082cf6
Merge pull request #11888 from KorPhaeron/toolboxcrusaders
...
Guardian Changes
2015-09-24 01:46:59 +03:00
Razharas
f8e2f721c3
Merge pull request #11877 from Core0verload/suicide
...
Russian roulette: "Spin the chamber" edition.
2015-09-24 01:44:12 +03:00
Razharas
b2e42f518d
Merge pull request #11876 from Aranclanos/beaker
...
Adds a qdel check for when the beaker spills their reagents on the tu…
2015-09-24 01:43:03 +03:00
MMMiracles
59cd06a282
.05 too short
2015-09-23 18:40:37 -04:00
Razharas
01a23d020e
Merge pull request #11848 from xxalpha/smoothlattice
...
Lattices and catwalks now use generic icon smoothing.
2015-09-24 01:39:12 +03:00
