588c79873f
Merge pull request #7562 from Iamgoofball/drugs
...
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
02714fffbd
Merge pull request #7950 from MrStonedOne/feartheageless
...
Fixes players getting no age on first connection (and adds a new player admin notice)
2015-02-24 22:52:30 -06:00
765ae220fa
fixes blackpowder bombcap shit
2015-02-24 20:35:47 -08:00
1ac844073a
carpet fixes
2015-02-24 20:25:57 -08:00
c0ae53a566
changes and shit, adds prespawn colorful smoke grenade for fun times and adminning
2015-02-24 20:15:06 -08:00
096324b93b
Merge pull request #7897 from paprka/riiiip
...
Packages play a ripping noise when you open them
2015-02-24 21:47:52 -06:00
704cf6ed37
Finally nerfs Salglu, changes salt recipe to water+sodium+chlorine
2015-02-24 18:51:12 -08:00
33a650d2c9
Merge pull request #7833 from RemieRichards/AttackbyParams
...
Attackby() now contains a Params argument.
2015-02-25 04:07:01 +03:00
6d64c6ba10
Revert "Replaces Xenomicrobe gas from Experimentor."
2015-02-24 23:22:43 +01:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
263682009e
Merge remote-tracking branch 'remotes/upstream/master' into ExperimentorFunRemoval
...
Conflicts:
code/modules/research/experimentor.dm
2015-02-24 14:23:36 -06:00
bcecdaf938
Merge pull request #7928 from phil235/BuildmodeHelpFix
...
Fixes buildmode throw function's help information.
2015-02-24 10:12:15 -08:00
84296b10fa
Merge pull request #7930 from phil235/XenoPounceMessageFix
...
Fixes xeno pouncing messages being bold green for human viewers.
2015-02-24 10:12:03 -08:00
b3c4f2948f
Merge pull request #7931 from phil235/FoodFitFix
...
Fix all foods getting the warning message about ingredient being too big
2015-02-24 10:11:42 -08:00
2d5fe2b41e
Merge pull request #7922 from Mandurrrh/clownbugs
...
Fixes #7910 and #7909 clown related bugs.
2015-02-24 18:56:30 +01:00
35f3abfb37
Fixes players getting no age on first connection
...
This was allowing them to choose any job on servers that use the job age system.
This also adds an admin message on a players first connection. (requested)
2015-02-23 20:31:16 -08:00
722c4cb1ef
re-adds GOTTAGOFAST, renames the current gottagofast to IGNORESLOWDOWN, adds GOTTAGOREALLYFAST for meth
2015-02-23 19:35:58 -08:00
4735e1c02a
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
2015-02-23 18:47:21 -08:00
4df2a92f88
Merge pull request #7824 from Delimusca/zipzaps
...
replaces broken turret gun
2015-02-23 23:38:10 +01:00
e889ee7a42
Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
...
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
b30aaf3b47
fixed turret slotflag, inheritance vars
2015-02-23 14:55:26 -07:00
537d76dbd9
Merge pull request #7684 from dannno/sechardsuitresprite
...
Sec Hardsuit Resprite/HoS Hardsuit
2015-02-23 16:02:51 -05:00
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
08fd5d5146
Merge pull request #7914 from paprka/jetpax
...
Fixes breathing from jetpacks
2015-02-23 12:59:49 -08:00
ac5fc9b044
Merge pull request #7544 from Incoming5643/popcapgames
...
Adds optional population caps
2015-02-23 17:20:02 +01:00
984b7cb8f6
Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
...
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01:00
6a6a56283f
Fixes buildmode throw function's help information. (left and right were switched)
2015-02-23 14:34:40 +01:00
8439310170
Fixes xeno pouncing messages being bold green for human viewers.
2015-02-23 14:09:16 +01:00
7b33271e85
Fix all foods getting the warning message about ingredient being too big.
2015-02-23 13:51:31 +01:00
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
7b8a8a3308
Merge pull request #7870 from phil235/WindowFormattingFix
...
Two window fixes
2015-02-22 20:18:21 -08:00
7f95f869a0
Merge pull request #7874 from phil235/SlimecoreMobSpawnFix
...
Gold slime reaction fixes.
2015-02-22 20:17:55 -08:00
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
e03d98786b
Fixes #7910 and #7909 clown related bugs.
2015-02-22 20:53:39 -05:00
941e4ba907
increased heavy recoil, reduced drop chance
2015-02-22 18:52:53 -07:00
b439b838d3
jetterpecks
2015-02-22 13:24:26 -08:00
fa0fa08171
Fixes #7877 Sleepypen bug. Pen only injected 50 of the 55 units.
2015-02-22 12:14:14 -05:00
b7e7d5a877
final fixes and changes
2015-02-22 06:35:49 -08:00
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
96e7a5c473
Merge pull request #7864 from Jordie0608/yoursisthelistthatwillcrashtheserver
...
Warning check before sorting long lists in vv
2015-02-22 11:57:01 +01:00
3675f2e997
Merge pull request #7899 from Jordie0608/eyesarewindowstothesoulbeardsarewindowstothechin
...
Fixes #7898
2015-02-22 11:55:13 +01:00
edcfae62d3
spellfix
2015-02-22 21:32:39 +11:00
3572e2c2c5
packages play a ripping noise when you open them
2015-02-22 01:11:03 -08:00
44e3c104e3
Merge pull request #7857 from Delimusca/heatermaths
...
fixes heater rounding, lowered heater coefficient
2015-02-21 23:37:33 -08:00
f608bf2a31
improves heavy weapons
2015-02-21 19:00:31 -07:00
167f4ef0ee
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
2015-02-21 14:14:50 -08:00
31491a5e27
quick push of everything I have now, fucking foam
2015-02-21 13:36:16 -08:00
ca57c1070f
Fixes goldslime+blood reaction spawning a hostile mob and goldslime+plasma only spawning 1 mob.
2015-02-21 20:45:34 +01:00
079f47c47c
Merge pull request #7768 from GunHog/AdminLoggingForExperimentor
...
Admin logging for Experimentor and Relics
2015-02-21 19:19:48 +01:00
19e3cd5d1e
Fixes a window's size and a colored text in another one.
2015-02-21 16:24:13 +01:00
Razharas
Cheridan
Iamgoofball
phil235
Remie Richards
GunHog
hornygranny
MrStonedOne
Delimusca
WJohn
Swag McYolosteinen
phil235
Mandurrrh
paprka
Jordie0608