phil235
4df2a92f88
Merge pull request #7824 from Delimusca/zipzaps
...
replaces broken turret gun
2015-02-23 23:38:10 +01:00
Razharas
e889ee7a42
Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
...
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
Delimusca
b30aaf3b47
fixed turret slotflag, inheritance vars
2015-02-23 14:55:26 -07:00
WJohn
537d76dbd9
Merge pull request #7684 from dannno/sechardsuitresprite
...
Sec Hardsuit Resprite/HoS Hardsuit
2015-02-23 16:02:51 -05:00
hornygranny
5cb7da19e8
Merge pull request #7908 from Mandurrrh/sleepypensbug
...
Fixes #7877 Sleepypen bug. Pen only injected 50 of the 55 units.
2015-02-23 13:01:31 -08:00
hornygranny
08fd5d5146
Merge pull request #7914 from paprka/jetpax
...
Fixes breathing from jetpacks
2015-02-23 12:59:49 -08:00
Swag McYolosteinen
ac5fc9b044
Merge pull request #7544 from Incoming5643/popcapgames
...
Adds optional population caps
2015-02-23 17:20:02 +01:00
Swag McYolosteinen
984b7cb8f6
Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
...
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01: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
7b8a8a3308
Merge pull request #7870 from phil235/WindowFormattingFix
...
Two window fixes
2015-02-22 20:18:21 -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
Delimusca
941e4ba907
increased heavy recoil, reduced drop chance
2015-02-22 18:52:53 -07:00
paprka
b439b838d3
jetterpecks
2015-02-22 13:24:26 -08:00
Mandurrrh
fa0fa08171
Fixes #7877 Sleepypen bug. Pen only injected 50 of the 55 units.
2015-02-22 12:14:14 -05: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
Delimusca
f608bf2a31
improves heavy weapons
2015-02-21 19:00:31 -07: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
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
19e3cd5d1e
Fixes a window's size and a colored text in another one.
2015-02-21 16:24:13 +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
Jordie0608
5a3d9d883f
Warning check before sorting long lists in vv
2015-02-21 21:46:42 +11: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
Cheridan
23677f4df1
Merge pull request #7808 from phil235/CookingTweaks
...
Cooking Tweaks
2015-02-20 12:02:04 -06:00
Swag McYolosteinen
b67569869b
Merge pull request #7843 from Mandurrrh/fixforbooze
...
Fixes issue #7841
2015-02-20 18:51:29 +01: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
Razharas
e4fa3369f2
Merge pull request #7743 from GunHog/YetAnotherExperimentorFix
...
Fixes E.X.P.E.R.I-MENTOR blood sacrifice!
2015-02-20 09:51:55 +03:00
Razharas
452aa3d961
Merge pull request #7791 from Mandurrrh/Booze
...
Adds fountain machines for bar.
2015-02-20 09:19:42 +03:00
hornygranny
383e4e7111
Merge pull request #7792 from Menshin/regen_statis_tweaks
...
Regenerative statis tweaks
2015-02-19 13:07:24 -08:00
hornygranny
ea12d68e60
Merge pull request #7817 from paprka/whatthefucktg
...
Syndicate shotguns spawn with buckshot by default
2015-02-19 13:07:08 -08:00
Remie Richards
42fe551665
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00:00
Razharas
5365dd1438
Merge pull request #7799 from paprka/magshit
...
removes bloat from magazines icons
2015-02-19 21:01:46 +03:00
phil235
66720a5ce9
Merge pull request #7834 from Menshin/telexploit_fix
...
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:39:49 +01:00
Menshin
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
phil235
83db82e62d
Fixed a typo
2015-02-19 11:52:40 +01:00
hornygranny
0cd74ff882
Merge pull request #7717 from phil235/sechailerAdjustFix
...
Fixes the cyborg sechailer being adjustable.
2015-02-18 21:50:12 -08:00
hornygranny
9b91896897
Merge pull request #7769 from phil235/rapidDupeProcFix
...
Fixes bugs with experimentor relics with rapidDupe proc.
2015-02-18 21:49:48 -08:00
hornygranny
c99ee72b55
Merge pull request #7788 from phil235/NeurotoxinReactionFix
...
Fixes neurotoxin reaction's required temperature.
2015-02-18 21:49:01 -08:00
hornygranny
dbee9709d1
Merge pull request #7790 from phil235/CryoStingExploitFix
...
Fixes cryosting detection exploit
2015-02-18 21:48:45 -08:00
