Commit Graph

19874 Commits

Author SHA1 Message Date
Cheridan 8b2175b5e9 Merge pull request #8989 from MrStonedOne/patch-8
Removes admin notices on failed logins in isbanned
2015-04-17 09:37:07 -05:00
Cheridan d6741236b5 Merge pull request #8991 from Fayrik/AllTheSmallThings
One-Click-Antag Tweaks: Now with more jobbans!
2015-04-17 09:30:08 -05:00
Cheridan 4c100c1ff7 Merge pull request #8968 from phil235/AlienNestPixelFix
Fix for alien nest and alien pixel shift
2015-04-16 20:36:44 -05:00
phil235 6807b1ae48 Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +02:00
Swag McYolosteinen 64cca56c09 Merge pull request #8976 from AnturK/abduction_update
Abduction Fixes & Tweaks
2015-04-16 12:27:34 +02:00
AnturK c4f96685b3 * Sprite fixes 2015-04-16 12:17:55 +02:00
AnturK 1c5c0afc41 * SPRITES! 2015-04-16 12:17:54 +02:00
AnturK bc71b4b8b3 * Fixes observers not seeing abductor hivemind
* Fixes humans without glands getting added to experiment history
* Makes science tool marking more intuitive (Just one click to mark anything now)
* Adds small storage space
* Adds Advanced Baton - Stun,Sleep,Cuff in one tool
* Makes console landmarks search for nearby machine/pad instead of spawning them next to it for mappers
* Fixes only one team spawning
* Fixes roundend report
* Fixes adding more teams to the round
2015-04-16 12:15:41 +02:00
Fayrik f6983f22e4 Age check works with any type of game mode, and nuke teams report failure if there aren't any candidates at all. 2015-04-16 10:13:48 +01:00
Jordie 2d2fbe7c0e Merge pull request #9009 from Jordie0608/thewatchmenareanallegoryforintrospection
Changelog
2015-04-16 19:12:58 +10:00
Jordie0608 83a68d0b5c compiled 2015-04-16 19:08:46 +10:00
Jordie0608 c556ff3843 edits 2015-04-16 19:08:25 +10:00
Jordie c4b0821090 Merge pull request #8983 from MrStonedOne/patch-7
Removes resting from ghost verb
2015-04-16 18:19:28 +10:00
Jordie c46bac3721 Merge pull request #8982 from MrPerson/fun_fact_you_can_currently_attack_light_with_a_toolbox
Makes light objects not appear via alt-click
2015-04-16 18:19:18 +10:00
Jordie 15a9d37d4e Merge pull request #8975 from MrStonedOne/patch-6
Fixes href exploit relating to admins without +fun being able to force events
2015-04-16 18:19:07 +10:00
Jordie 4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Jordie 210eedbb48 Merge pull request #8841 from GunHog/Bot_Radio_And_Newscasters
Bot fixes and PDA upgrades!
2015-04-16 18:18:44 +10:00
Cheridan 87edea4eab Merge pull request #8969 from phil235/BundleFix2
Another bundle of fixes
2015-04-15 21:08:13 -05:00
Fayrik 772b05d56b New Jobbans, and proper messages for when you fail to spawn antags. 2015-04-15 20:27:44 +01:00
MrStonedOne eb6279a5a4 Removes admin notices on failed logins in isbanned
This could be used to spam admins, without them having any way to stop it, and as tobba has informed me, isbanned() is called before byond does much validation on the data (like checking that the claimed username exist or validating that they own it), leaving these notices vulnerable to html injection
2015-04-15 10:11:37 -07:00
GunHog 029b2550f5 Makes it slightly harder for a medibot to get stuck. 2015-04-15 11:15:01 -05:00
GunHog bcb6331dbf Merge remote-tracking branch 'remotes/origin/Of_Bots_And_Logic' into Bot_Radio_And_Newscasters 2015-04-15 09:54:20 -05:00
Cheridan a9002da949 Merge pull request #8776 from Xhuis/its_time_for_slimeperson_on_slimeperson_action
Adds an additional effect to green slime cores
2015-04-15 08:53:55 -05:00
Cheridan 4468cf7bc5 Merge pull request #8935 from Incoming5643/deep_fried_lizards
Extra mutantrace parts won't hold color if the body gets husked
2015-04-15 08:29:26 -05:00
Swag McYolosteinen 7c36795db3 Merge pull request #8970 from phil235/WingFixChu
Fixes wingfangchu recipe.
2015-04-15 13:03:58 +02:00
Swag McYolosteinen 5e6cbd57cd Merge pull request #8916 from Iamgoofball/patch-55
Fixes and changes Napalm Recipe
2015-04-15 13:03:14 +02:00
Swag McYolosteinen 36cac2405d Merge pull request #8932 from Iamgoofball/patch-56
Fixes incendiary grenades
2015-04-15 13:03:03 +02:00
Swag McYolosteinen f4aa06af22 Merge pull request #8972 from MrStonedOne/patch-5
Fixes runtime when clientless mobs change areas
2015-04-15 13:02:53 +02:00
Swag McYolosteinen 65f0e36eeb Merge pull request #8942 from AnturK/martialfixes
Martial art fixes
2015-04-15 13:02:23 +02:00
Swag McYolosteinen 6c1117c14d Merge pull request #8958 from Incoming5643/excuse_me_while_I_vent_a_bit
buffs head slugs a bit
2015-04-15 13:01:58 +02:00
Swag McYolosteinen a90a6a0699 Merge pull request #8971 from MrStonedOne/patch-4
fixes sawu's shit spamming my runtimes.
2015-04-15 12:55:25 +02:00
Swag McYolosteinen baf3c06171 Merge pull request #8957 from MrStonedOne/I-spent-five-minutes-trying-to-think-up-a-branch-name-and-all-I-got-was-this-lousy-excuse-of-one
Admins can now drag ghosts to mobs to put that ghost in control of that mob
2015-04-15 12:24:13 +02:00
MrStonedOne e7d62ee356 Adds changelog for admin ghost drag 2015-04-15 03:00:07 -07:00
MrStonedOne 2227b7adb3 Adds some sanity checks to admin ghost drag. 2015-04-15 02:58:54 -07:00
MrStonedOne f1943945e2 Removes resting from ghost verb
This caused issues with mobs like borgs and simple mobs where they would be unable to move if admins put another ckey in the mob after they ghosted but there would be no clear indication as to why they couldn't move and in some cases, no way to un-rest without further admin intervention.
2015-04-14 23:50:06 -07:00
MrPerson 58a1f12103 Makes light objects not appear via alt-click
Fixes #8954
2015-04-14 20:59:52 -07:00
Cheridan 26a974a8c3 Merge pull request #8943 from MrPerson/ied_fixes
IED fixes
2015-04-14 19:40:50 -05:00
phil235 d5318a033b Merge pull request #8933 from Cheridan/snackbar
New barsign!
2015-04-15 00:33:18 +02:00
Cheridan 63b590d1c8 Merge pull request #8950 from Incoming5643/malfunction_junction_whats_your_major_malfunction
Fixes malf powers being broken
2015-04-14 17:22:31 -05:00
Cheridan bf6ae43aec Merge pull request #8917 from phil235/BorgDrillFix
Fixes miner cyborg being able to eject their drill's cell.
2015-04-14 17:19:27 -05:00
phil235 de8080f7b2 Merge pull request #8927 from Xhuis/shadowlingUpdateOne
Shadowling Update I
2015-04-14 21:22:46 +02:00
phil235 d6c9a5158d Fixes a missing pixel in some uniforms.
Fixes the bartender's uniform when adjusted (typo in the icon name).
2015-04-14 20:59:47 +02:00
phil235 a584b8df0e woops 2015-04-14 20:30:02 +02:00
Xhuis 5075909757 More bug fixes 2015-04-14 14:23:30 -04:00
MrStonedOne d9a9ae1358 adds a permission check to force event's topic
There existed a href exploit that allowed any admin to force an event.
2015-04-14 10:48:24 -07:00
MrStonedOne 71c07dd0e5 Fixes runtime when clientless mobs change areas 2015-04-14 10:41:12 -07:00
MrStonedOne a6602795c9 fixes runtimes with npcpool 2015-04-14 10:30:58 -07:00
phil235 882ab28794 derp, wrong PR. 2015-04-14 19:09:57 +02:00
phil235 c39168b059 Fixes wingfangchu recipe. It is now a soup (consistent with its sprite) 2015-04-14 18:44:55 +02:00
phil235 2ed906b990 Fixes inhand sprites for eggs.
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00