f7342415c1
Merge pull request #7959 from phil235/AttackSelfTKFix
...
A bunch of fixes
2015-02-25 19:54:36 -08:00
f64fb21f47
Merge pull request #7955 from Jordie0608/greytiderahelps!admintakes10braindamage!
...
Fixes #7288 VV, moreinfo stamina display and replaces CA with TP
2015-02-25 19:53:41 -08:00
f0f509bc0b
Merge pull request #7951 from Incoming5643/max_min_same_thing
...
population cap hotfix
2015-02-25 19:53:18 -08:00
6cd1942bb2
Merge pull request #7949 from Iamgoofball/patch-33
...
Fixes blobs flinging/pulling themselves and anchored objects
2015-02-25 19:53:00 -08:00
3a762600b1
Merge pull request #7958 from phil235/RestrainedMessageSpamFix
...
Fixes restrained message spam by giving it a cooldown.
2015-02-25 19:52:49 -08:00
beea5bc448
Merge pull request #7688 from Razharas/FUCKGIT
...
More vines for the god of vines
2015-02-25 18:26:37 +01:00
7c93a9081e
Merge pull request #7941 from phil235/SmallFoodRenamingFix
...
Fixes custom food renaming for sandwiches.
2015-02-25 08:24:38 -06:00
4ba5161394
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
...
Conflicts:
code/modules/hydroponics/seeds.dm
Resolving dem conflicts
2015-02-25 15:17:14 +03:00
4a962b546b
Fixes runtimes
...
Fixes runtimes and explosive vines being pants on head retarded
2015-02-25 15:09:32 +03:00
755e99a33d
Merge pull request #7977 from Jordie0608/atanysecondaclowncouldbecreepingupbehindyou
...
Fixes warning on compile
2015-02-25 10:29:20 +03:00
9ce2add084
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-25 14:10:54 +08:00
417b49ab2b
Merge pull request #7703 from paprka/youlovenerfs
...
Electrode and stun revolver changes
2015-02-25 09:08:10 +03:00
1d552123dc
hos gun revert
2015-02-24 21:54:48 -08:00
541b8b30c2
fixes warning on compile
2015-02-25 16:28:21 +11:00
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
7fad8a3bab
nerfs energy bolts more
2015-02-24 20:04:48 -08:00
393123b50b
Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
...
Conflicts:
code/modules/projectiles/gun.dm
icons/obj/guns/energy.dmi
2015-02-24 20:03:33 -08:00
24fbdb449d
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
2015-02-25 11:50:05 +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
da53175ad5
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-25 11:44:27 +08: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
0bf9605888
spellang councet
2015-02-24 16:19:21 -05: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
01720fc486
Adding a warning comment
2015-02-24 17:13:54 +01:00
79de9615dc
Fixes not being able to prime grenade, toggle lamps and other attack_self things with TK.
...
Fixes the blobbernaut death animation looping.
Fixes armchair layer being above ghost layer.
Fixes chloral hydrate metabolization rate (and 2 other reagents)
Fixes a typo in closet/attack_self() .
2015-02-24 16:36:40 +01:00
712f599ccf
Fixes restrained message spam by giving it a cooldown.
2015-02-24 14:32:31 +01:00
6b815c7801
Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP
2015-02-24 20:02:43 +11:00
76b9fbb874
popcaphotfix: misused a max that could have rendered the hard popcap useless
2015-02-23 23:34:17 -05: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
c9a713a5fd
Fixes blobs flinging/pulling themselves
2015-02-23 19:58:52 -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
2c7ffaaea2
Fixes custom food naming for sandwiches.
2015-02-23 22:24:49 +01:00
2095fba5ca
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
2015-02-24 00:16:27 +03: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
hornygranny
phil235
Cheridan
Razharas
Razharas
Steelpoint
paprka
Jordie0608
Iamgoofball
Remie Richards
Incoming
GunHog
phil235
MrStonedOne
Delimusca
WJohn