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
9b7d23776c
Auto load required nanoui files on client login
...
This is still an inprogress so please do not merge
2015-02-25 12:25:21 +13:00
081df302f5
Makes the "are too many people dead for this to be fun?" check more indicative of people who are actually playing
...
Adds a new toggle: Midround_antagonist that allows players to opt out of gaining antagonist through this system if they'd prefer. It defaults to on but is newbie safe because without any antagonist flags (which default to off), it won't place players into antagonist slots.
2015-02-24 18:17:07 -05: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
93a74c9df4
whoops, missed a debug message
2015-02-24 16:14:35 -05:00
cbcc52beeb
Updates Manage Job Slots to work with assistant slots
...
Any (non-silicon) job can now be set to be an unlimited slot job from Manage Job Slots
People will be allowed to join as assistant if no other jobs are availible
Removes a redundant sanity check from AssignRole()
2015-02-24 16:06:36 -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
44ea489940
THE OWL RETURNS: PART 2: REVENGE OF THE GRIFFIN
...
- adds The Griffin costume to the autodrobe
2015-02-23 17:30:17 -05: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
e8fb3d1f05
THE OWL RETURNS: PART 1: THE PLASMA RISES
...
- all owl items resprited
- owl wings added; suit slot item, wings are toggleable
2015-02-23 16:49:17 -05: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
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
Iamgoofball
paprka
Steelpoint
Cheridan
Razharas
oranges
Incoming
phil235
Remie Richards
GunHog
hornygranny
phil235
Jordie0608
MrStonedOne
dannno
Delimusca
Razharas
WJohn
Swag McYolosteinen
Mandurrrh