hornygranny
82a7beb02c
Merge pull request #7888 from xxalpha/crayonruntimes
...
Add initialize for crayons and fix runtime error.
2015-02-22 20:19:55 -08:00
hornygranny
2778eccc1b
Merge pull request #7873 from phil235/SecRecordConsoleFix
...
Fixes not being able to modify certain properties on security record console
2015-02-22 20:19:25 -08:00
hornygranny
fe1ad1a152
Merge pull request #7861 from phil235/OfficeChairLayerFix
...
Fixes office chair layer not updating when moving the chair around.
2015-02-22 20:19:13 -08:00
hornygranny
a5a7b590d3
Merge pull request #7866 from phil235/PullBuckleFix
...
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
2015-02-22 20:18:54 -08:00
hornygranny
a664c551f1
Merge pull request #7867 from phil235/SlimeBuckleFix
...
Makes slimes unbucklable again.
2015-02-22 20:18:33 -08:00
hornygranny
7b8a8a3308
Merge pull request #7870 from phil235/WindowFormattingFix
...
Two window fixes
2015-02-22 20:18:21 -08:00
hornygranny
d2b7afa083
Merge pull request #7871 from phil235/NarsieSpamFix
...
Fixes narsie message spam from multiple nar-sie spawn.
2015-02-22 20:18:09 -08:00
hornygranny
7f95f869a0
Merge pull request #7874 from phil235/SlimecoreMobSpawnFix
...
Gold slime reaction fixes.
2015-02-22 20:17:55 -08:00
hornygranny
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
xxalpha
cf05a587f9
Code tweak.
2015-02-22 13:58:15 +00:00
paprka
8f707e134e
Merge branch 'master' of https://github.com/tgstation/-tg-station into starrlight
...
Conflicts:
code/controllers/configuration.dm
2015-02-22 04:12:54 -08:00
Swag McYolosteinen
1035d95f90
Merge pull request #7716 from paprka/megaphoney
...
Adds megaphones
2015-02-22 12:58:49 +01:00
Swag McYolosteinen
c792f211a3
Merge pull request #7555 from paprka/asscap
...
Assistant cap config
2015-02-22 12:58:27 +01:00
paprka
d8e3f7f28a
fixes usr.stat
2015-02-22 03:37:02 -08:00
Swag McYolosteinen
8e4982276a
Merge pull request #7825 from RandomMarine/cargokits
...
Adds brute first aid kits to cargo.
2015-02-22 12:06:22 +01:00
Swag McYolosteinen
3cd66f4f34
Merge pull request #7739 from paprka/computerlights
...
Computers emitting light
2015-02-22 12:05:34 +01:00
Swag McYolosteinen
69d4ec3e5f
Merge pull request #7615 from Xhuis/burnfilthypigs
...
Adds malicious modes to air and fire alarms
2015-02-22 12:03:53 +01:00
Swag McYolosteinen
555840fc1b
Merge pull request #7498 from Incoming5643/Fell_Pull_Commit_of_Orc_Slaying_+2
...
Magic Mania 1.85: RPG loot event
2015-02-22 11:59:09 +01:00
Swag McYolosteinen
96e7a5c473
Merge pull request #7864 from Jordie0608/yoursisthelistthatwillcrashtheserver
...
Warning check before sorting long lists in vv
2015-02-22 11:57:01 +01:00
Swag McYolosteinen
3675f2e997
Merge pull request #7899 from Jordie0608/eyesarewindowstothesoulbeardsarewindowstothechin
...
Fixes #7898
2015-02-22 11:55:13 +01:00
Jordie0608
edcfae62d3
spellfix
2015-02-22 21:32:39 +11:00
hornygranny
44e3c104e3
Merge pull request #7857 from Delimusca/heatermaths
...
fixes heater rounding, lowered heater coefficient
2015-02-21 23:37:33 -08:00
xxalpha
f2a27ade31
Add initialize for crayons and fix runtime error.
2015-02-22 02:49:56 +00:00
phil235
ca57c1070f
Fixes goldslime+blood reaction spawning a hostile mob and goldslime+plasma only spawning 1 mob.
2015-02-21 20:45:34 +01:00
phil235
6aff3f3e3f
Fixes not being able to modify certain properties on security record console records.
2015-02-21 19:34:31 +01:00
Swag McYolosteinen
079f47c47c
Merge pull request #7768 from GunHog/AdminLoggingForExperimentor
...
Admin logging for Experimentor and Relics
2015-02-21 19:19:48 +01:00
phil235
8f493d64c8
Fixes narsie message spam from multiple nar-sie spawn.
2015-02-21 16:41:17 +01:00
phil235
19e3cd5d1e
Fixes a window's size and a colored text in another one.
2015-02-21 16:24:13 +01:00
phil235
2dd6b42b14
Makes slimes unbucklable again.
2015-02-21 15:20:34 +01:00
phil235
e9a943218c
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
...
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01:00
phil235
68942e1ace
Merge pull request #7686 from xxalpha/newgraffiti
...
New graffiti.
2015-02-21 12:46:45 +01:00
Jordie0608
5a3d9d883f
Warning check before sorting long lists in vv
2015-02-21 21:46:42 +11:00
phil235
491bc2380b
Fixes office chair layer not updating when moving the chair around.
2015-02-21 11:40:58 +01:00
Delimusca
0f8fc471d3
fixes heater rounding, coeff. lowered to .10
2015-02-21 01:03:30 -07:00
Razharas
51b4bbf71e
Revert "Allows portable machines to be mounted on any turf that can have cables."
2015-02-21 02:29:29 +03:00
GunHog
cd00e07f4f
Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor
...
Conflicts:
code/modules/research/experimentor.dm
2015-02-20 15:23:07 -06:00
GunHog
1cd892a0fd
Experimentor Invesigate Take 1
...
- Logs lots of the things to experimentor investigate.
2015-02-20 15:09:59 -06:00
Cheridan
fe3764dae8
Merge pull request #7765 from Thunder12345/glovening
...
[REFACTOR] Reworks maintenance fake insulated gloves
2015-02-20 14:24:54 -06:00
Cheridan
ac00052da6
Merge pull request #7780 from xxalpha/catwalkmachines
...
Allows portable machines to be mounted on any turf that can have cables.
2015-02-20 13:32:44 -06:00
Cheridan
6d78f9b77d
Merge pull request #7828 from Incoming5643/let_us_never_speak_of_this_again
...
Removes the unintended ability to have sex with cats
2015-02-20 13:18:46 -06:00
Swag McYolosteinen
b4a1594810
Merge pull request #7797 from Mandurrrh/Barsigntaketwo
...
Adds interchangeable bar signs and a variety of choices.
2015-02-20 19:34:49 +01:00
Cheridan
e861281a03
Merge pull request #7783 from Delimusca/minesofshame
...
cleans up mines
2015-02-20 12:16:14 -06:00
Cheridan
23677f4df1
Merge pull request #7808 from phil235/CookingTweaks
...
Cooking Tweaks
2015-02-20 12:02:04 -06:00
Mandurrrh
df57ea312b
add singulo description
2015-02-20 12:56:11 -05:00
Swag McYolosteinen
048759adca
Merge pull request #7818 from Mandurrrh/dancingqueen
...
Color options added to light up floor tiles.
2015-02-20 18:51:56 +01:00
Swag McYolosteinen
b67569869b
Merge pull request #7843 from Mandurrrh/fixforbooze
...
Fixes issue #7841
2015-02-20 18:51:29 +01:00
Mandurrrh
1301fdd9ab
Fixes maps, adds emp barsign, fixes merge conflicts.
2015-02-20 12:08:04 -05:00
phil235
7af2e457c8
Merge pull request #7705 from GunHog/NVG_Mesons
...
Adds NVG Mesons
2015-02-20 17:44:38 +01:00
Mandurrrh
3e43beab29
Fixes issue #7841
2015-02-20 09:15:20 -05:00
Mandurrrh
7fbf0a261b
mergeconflictfix
2015-02-20 09:06:04 -05:00
