6839 Commits

Author	SHA1	Message	Date
Swag McYolosteinen	6f5b2cf7ea	Merge pull request #6224 from fleure/gargleblaster ... Changes Gargle Blaster description	2014-12-06 10:28:23 +01:00
Razharas	6fb548b283	Merge pull request #6220 from MrPerson/yet_another_attempt_at_fixing_this_shit ... Fixes mobs getting moved on the escape pods when buckled	2014-12-06 07:42:12 +03:00
Cheridan	d124415c85	Merge pull request #6212 from GunHog/DS_Ninja_Biosuit_Anti-acid ... Acid immunity for Biosuits, Ninja, and DeathSquad, and fire protection for DeathSquad	2014-12-05 14:45:53 -06:00
Cheridan	f909d59d1a	Merge pull request #6130 from phil235/AttackMsgStandardizedFormat ... Standardizing attack messages to always show the attacker first	2014-12-04 12:45:31 -06:00
fleure	571e3a4487	Changes Gargle Blaster description	2014-12-04 18:03:50 +00:00
Cheridan	90fc7f3740	Merge pull request #6026 from phil235/BluespaceCrystalVanishFix ... Adding sparks, sound and messages when a bluespace crystal is crushed or thrown	2014-12-04 09:32:02 -06:00
MrPerson	47c46844f2	Another buckling fix ... Fixes #5730 The ride never ends	2014-12-04 05:42:21 -08:00
GunHog	958e824f37	Acid protection for Biosuits, Ninja, and DeathSquad ... - Biosuits, Ninja armor, and Deathsquad armor are now immune to acid. - Deathsquad armor is now also fireproof!	2014-12-03 22:58:21 -06:00
Menshin	738bfe27a4	Not idea why if(_dmm_preloader) fails to catch nulls...	2014-12-03 20:03:47 +01:00
hornygranny	bc9d9f6d58	Merge pull request #6105 from RemieRichards/AcidProtectionUpdate ... Acid protection update	2014-12-03 10:28:47 -08:00
hornygranny	23fd694320	Merge pull request #6127 from phil235/SpanFix1 ... Fixes span classes and show_message()'s	2014-12-03 10:28:06 -08:00
hornygranny	81061d3f62	Merge pull request #6182 from phil235/AdjustMaskFix ... Fixes adjustmask verb for sechailer	2014-12-03 10:27:25 -08:00
phil235	dcb48e3168	Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1 ... Conflicts: code/modules/mob/living/simple_animal/friendly/corgi.dm	2014-12-03 18:59:32 +01:00
Swag McYolosteinen	879f67d834	Merge pull request #6142 from CorruptComputer/dropinacancel ... Adds a cancel button to the drop bomb verb	2014-12-03 18:12:45 +01:00
Swag McYolosteinen	5863d2f5e8	Merge pull request #6075 from Jordie0608/spaceisalivewiththesoundofmidis ... Stop Sounds usable by any holder	2014-12-03 17:49:51 +01:00
Swag McYolosteinen	501ecb1d2a	Merge pull request #5945 from JJRcop/get_ghost-fix ... Fixes unreported issue with get_ghost	2014-12-03 17:45:07 +01:00
Remie Richards	16506dabc9	Merge pull request #6162 from tkdrg/simplepush ... mob/Bump() refactor	2014-12-03 16:43:58 +00:00
Swag McYolosteinen	9618c11a60	Merge pull request #5480 from Perakp/wormholeProjector ... Bluespace wormhole projector	2014-12-03 17:42:49 +01:00
Remie Richards	af54024222	Merge pull request #6120 from Menshin/maploader_multiple_tiles_underlaying ... [MAPLOADER] Add support for the DMM multiple tiles on one turf underlaying	2014-12-03 16:42:21 +00:00
Remie Richards	8eced8d302	Merge pull request #6134 from Menshin/null_loc_mobs_fix ... Prevent some mobs from spawning in nullspace	2014-12-03 16:39:30 +00:00
Cheridan	4a4b1c1266	Merge pull request #6169 from phil235/DeathNettleBlendFix ... Two fixes for grinder	2014-12-02 22:34:52 -06:00
hornygranny	3388c53838	Merge pull request #6110 from tkdrg/aiaiai ... Fixes exploit that lets AIs use machinery even after cameras are disabled	2014-12-02 18:40:28 -08:00
phil235	515807ee67	Fixes adjustmask verb for sechailer letting you chose the user mob from a list of all mobs on screen.	2014-12-02 19:25:31 +01:00
phil235	47762bf960	Fixes being able to click the grinder buttons while it's operating (ejecting beaker before grinding is finished), the grinder window is now correctly updated. ... Fixes death nettle not producing pacid upon grinding, fixes novaflower not producing condensedcapsaicin (one of its reagents) upon grinding. Renaming "inuse" var to "operating" to avoid confusion with "in_use" var	2014-12-01 16:57:07 +01:00
Razharas	b9b73531a6	Merge pull request #6104 from tkdrg/bouncy ... Stops the field from bouncing the sing around	2014-12-01 18:14:12 +03:00
tkdrg	74d73b29aa	mob/Bump() refactor. OOPing and general cleanup. ... Removes copy-paste. Creates three new mob/living procs. ObjBump, MobBump and PushAM which are called by mob/living/Bump(). Removes a ton of copy-paste and needless code. Also fixes simple_animal Bump() on harm intent. Previously, they'd move twice. Fixes #3550	2014-11-30 22:51:17 -03:00
Razharas	c8817469fc	Merge pull request #6124 from MrPerson/eye_lmao ... Redo cyborg icon updating	2014-11-30 22:46:37 +03:00
Menshin	8552a606f9	Minor optimization	2014-11-30 03:11:55 +01:00
CorruptComputer	ae37dc1013	Allows 0	2014-11-29 14:55:57 -06:00
CorruptComputer	fe3e3e8ecc	Adds a cancel button to the drop bomb verb	2014-11-29 12:39:57 -06:00
Perakp	48b1ee513e	Merge remote-tracking branch 'upstream/master' into wormholeProjector ... Conflicts: icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi	2014-11-29 09:37:40 +02:00
hornygranny	33e07e2291	Merge pull request #6113 from tkdrg/ass ... Fixes assistant jobban bug	2014-11-28 16:35:12 -08:00
Menshin	76ecd457b1	Killer tomatoes : ... * Prevent killer tomato from spawning inside nullspace * It's now impossible to eat an awakening killer tomato * Fixed been able to spawn lots of killer tomatoes by spam clicking the tomato object Drones : Prevent an edge case which would lead to a client spawning as drone in null space Brains : Makes brainmobs qdel instead of piling up inside the brain object	2014-11-28 23:24:12 +01:00
phil235	22e0771eb9	Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs.	2014-11-28 16:08:59 +01:00
MrPerson	89030ad3f7	Redo cyborg icon updating ... Removed the stupid "updateicon()" proc and placed the behavior in update_icons() and regenerate_icons() Removed redundant update_fire() calls Fixes #6057 since the staff calls regenerate_icons()	2014-11-27 23:04:35 -08:00
Menshin	d0d82aa187	Add support for the DMM multiple tiles on one turf underlaying	2014-11-28 00:03:54 +01:00
Intigracy	8a1baad03b	forgot the var / proc	2014-11-27 14:50:21 -08:00
hornygranny	b573a00f5e	Merge pull request #5918 from Razharas/Cfour ... Who am i kidding, its explosions rework for a long time already	2014-11-27 13:58:56 -08:00
hornygranny	bc7a7a7452	Merge pull request #6084 from tkdrg/hudindahood ... Fixes data/antag HUD bugs	2014-11-27 13:50:34 -08:00
hornygranny	dff524910a	Merge pull request #6088 from RemieRichards/SomeAcidBuffs ... Couple more changes to reagent sprayers.	2014-11-27 13:49:25 -08:00
Razharas	d2848e5f95	Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour	2014-11-28 00:32:30 +03:00
tkdrg	4da919ce75	Fixes assistant jobban bug ... Assistant-banned people who had assistant set to 'Yes' were unable to pick their job preferences.	2014-11-27 16:51:15 -03:00
tkdrg	2e0a2b80bd	Fixes AI canUseTopic() without camera exploit ... Fixes runtime in ai/Life()	2014-11-27 15:43:22 -03:00
Remie Richards	22cdf41891	Items worn INSIDE armour only melt when that armour is melted, Backpacks, Belts and handheld items are all worn externally so melt regardless of armour ... Also updates pixel_x and pixel_y randomisation of grey goo.	2014-11-27 17:16:58 +00:00
tkdrg	7153becc62	Fixes implants not updating the implant secHUD ... Makes med huds /carbon because of monkeys Makes HUDs update after implant removal surgery Fixes cloning not recovering antag huds	2014-11-27 12:56:17 -03:00
Remie Richards	99c53a7880	Reworks acid protection code, Works the same except now takes body_parts_covered flags into account and is overall a neater piece of code.	2014-11-27 15:54:46 +00:00
Razharas	275d7fdd77	Merge pull request #6038 from paprka/hatfix ... fixes head of security and warden hat flashbang confusion	2014-11-27 17:14:51 +03:00
tkdrg	65fb61be69	Stops the field from bouncing the sing around	2014-11-27 10:33:24 -03:00
Razharas	c5209f2399	Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour	2014-11-27 15:30:37 +03:00
Razharas	41a43b0040	Quickfix	2014-11-27 15:30:24 +03:00