Cheridan
|
e4eeed69bc
|
Merge pull request #7976 from Jordie0608/bioterrorreportedasleastpopularformasspaceterrorism
Fixes bioterror chemsprayer
|
2015-02-26 02:08:24 -06:00 |
|
Jordie0608
|
e89e925fef
|
removes empty new
|
2015-02-26 18:53:23 +11:00 |
|
Cheridan
|
2bf705deb8
|
Merge pull request #7884 from Incoming5643/layers4lizards
Added some layers so mutantrace sprites actually make sense
|
2015-02-26 01:47:40 -06:00 |
|
Cheridan
|
51dbce4607
|
Merge pull request #7982 from TZK13/Deathsquad-Corgi
Adds deathsquad corgis
|
2015-02-26 01:28:07 -06:00 |
|
hornygranny
|
f7342415c1
|
Merge pull request #7959 from phil235/AttackSelfTKFix
A bunch of fixes
|
2015-02-25 19:54:36 -08:00 |
|
hornygranny
|
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 |
|
hornygranny
|
f0f509bc0b
|
Merge pull request #7951 from Incoming5643/max_min_same_thing
population cap hotfix
|
2015-02-25 19:53:18 -08:00 |
|
hornygranny
|
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 |
|
hornygranny
|
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 |
|
Swag McYolosteinen
|
4826037b00
|
Merge pull request #7981 from MrStonedOne/revert-7970-removegaytider
Revert "Removes grey tide barsign"
|
2015-02-25 18:47:53 +01:00 |
|
phil235
|
beea5bc448
|
Merge pull request #7688 from Razharas/FUCKGIT
More vines for the god of vines
|
2015-02-25 18:26:37 +01:00 |
|
MrStonedOne
|
33d0507c8d
|
Suggested changes to graytide sign's desc wording
|
2015-02-25 08:10:42 -08:00 |
|
Cheridan
|
7c93a9081e
|
Merge pull request #7941 from phil235/SmallFoodRenamingFix
Fixes custom food renaming for sandwiches.
|
2015-02-25 08:24:38 -06:00 |
|
Razharas
|
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 |
|
Razharas
|
4a962b546b
|
Fixes runtimes
Fixes runtimes and explosive vines being pants on head retarded
|
2015-02-25 15:09:32 +03:00 |
|
Razharas
|
755e99a33d
|
Merge pull request #7977 from Jordie0608/atanysecondaclowncouldbecreepingupbehindyou
Fixes warning on compile
|
2015-02-25 10:29:20 +03:00 |
|
Razharas
|
05b2ec1e5f
|
Merge pull request #7420 from Steelpoint/HoSGun
Head of Security's Personal Firearm
|
2015-02-25 10:27:22 +03:00 |
|
TZK13
|
4e0ce8a452
|
Adds deathsquad corgis.
|
2015-02-25 01:16:17 -06:00 |
|
MrStonedOne
|
48ce33f3cb
|
Revert "Removes grey tide barsign"
|
2015-02-24 23:04:16 -08:00 |
|
Cheridan
|
9ba1dfaa26
|
Merge pull request #7970 from paprka/removegaytider
Removes grey tide barsign
|
2015-02-25 00:29:36 -06:00 |
|
Steelpoint
|
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 |
|
Razharas
|
417b49ab2b
|
Merge pull request #7703 from paprka/youlovenerfs
Electrode and stun revolver changes
|
2015-02-25 09:08:10 +03:00 |
|
paprka
|
1d552123dc
|
hos gun revert
|
2015-02-24 21:54:48 -08:00 |
|
Jordie0608
|
541b8b30c2
|
fixes warning on compile
|
2015-02-25 16:28:21 +11:00 |
|
Razharas
|
588c79873f
|
Merge pull request #7562 from Iamgoofball/drugs
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
|
2015-02-25 08:26:21 +03:00 |
|
Jordie0608
|
b931c66f2c
|
fixes bioterror chemsprayer
|
2015-02-25 16:08:59 +11:00 |
|
Cheridan
|
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 |
|
Iamgoofball
|
765ae220fa
|
fixes blackpowder bombcap shit
|
2015-02-24 20:35:47 -08:00 |
|
Iamgoofball
|
1ac844073a
|
carpet fixes
|
2015-02-24 20:25:57 -08:00 |
|
Iamgoofball
|
c0ae53a566
|
changes and shit, adds prespawn colorful smoke grenade for fun times and adminning
|
2015-02-24 20:15:06 -08:00 |
|
Steelpoint
|
a415ca24fd
|
RemovedCommentedCode
|
2015-02-25 12:11:05 +08:00 |
|
paprka
|
7fad8a3bab
|
nerfs energy bolts more
|
2015-02-24 20:04:48 -08:00 |
|
paprka
|
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 |
|
Steelpoint
|
24fbdb449d
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
|
2015-02-25 11:50:05 +08:00 |
|
Cheridan
|
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 |
|
Steelpoint
|
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 |
|
Razharas
|
05ef27a495
|
Merge pull request #7972 from paprka/moreruntimes
Fixes another runtime with starlight
|
2015-02-25 06:31:33 +03:00 |
|
Iamgoofball
|
704cf6ed37
|
Finally nerfs Salglu, changes salt recipe to water+sodium+chlorine
|
2015-02-24 18:51:12 -08:00 |
|
Razharas
|
33a650d2c9
|
Merge pull request #7833 from RemieRichards/AttackbyParams
Attackby() now contains a Params argument.
|
2015-02-25 04:07:01 +03:00 |
|
paprka
|
2d1642dd22
|
fixes another runtime with starlight
|
2015-02-24 16:48:06 -08:00 |
|
paprka
|
830b57afd5
|
removes grey tide barsign
|
2015-02-24 15:32:58 -08:00 |
|
phil235
|
6d64c6ba10
|
Revert "Replaces Xenomicrobe gas from Experimentor."
|
2015-02-24 23:22:43 +01:00 |
|
Remie Richards
|
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 |
|
Incoming
|
0bf9605888
|
spellang councet
|
2015-02-24 16:19:21 -05:00 |
|
GunHog
|
263682009e
|
Merge remote-tracking branch 'remotes/upstream/master' into ExperimentorFunRemoval
Conflicts:
code/modules/research/experimentor.dm
|
2015-02-24 14:23:36 -06:00 |
|
phil235
|
1a70e57551
|
Merge pull request #7939 from GunHog/Of_Malf_And_Turrets
Fixes Turret Upgrade Malfunction Power
|
2015-02-24 20:34:07 +01:00 |
|
phil235
|
23812bfabc
|
Merge pull request #7901 from Mandurrrh/holotapefix
Fixes #7883 Borgs can't pass through holotape
|
2015-02-24 19:22:19 +01:00 |
|
hornygranny
|
1c7c6fb40c
|
Merge pull request #7929 from phil235/GauzeMessageFix
Fix applying gauze on already bandaged and non bleeding person, the oper...
|
2015-02-24 10:12:33 -08:00 |
|
hornygranny
|
bcecdaf938
|
Merge pull request #7928 from phil235/BuildmodeHelpFix
Fixes buildmode throw function's help information.
|
2015-02-24 10:12:15 -08:00 |
|
hornygranny
|
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 |
|