2868 Commits

Author	SHA1	Message	Date
Cheridan	062d0c2086	Merge pull request #8759 from optimumtact/patch-3 ... Fix can_speak check in megaphone	2015-04-06 08:48:49 -05:00
Cheridan	1da595b535	Merge pull request #8737 from RemieRichards/NinjaCleanup2 ... A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff	2015-04-05 21:54:33 -05:00
Orange Borg	a5306ba1e0	Fix can_speak check in megaphone ... The original check actually made no sense, but worked because it returned false every time as there was never a message passed through	2015-04-05 20:29:07 +12:00
phil235	6550016ee6	Merge pull request #8723 from kingofkosmos/grammarfixes ... Recieve --> Receive	2015-04-04 20:00:21 +02:00
Remie Richards	5e93f57873	Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so.	2015-04-04 18:17:37 +01:00
Jordie	6d4f3b60f8	Merge pull request #8663 from dannno/sadclown ... sad trombone for clown pda	2015-04-04 20:58:21 +11:00
Jordie	6d34032385	Merge pull request #8628 from Fayrik/AllTheSmallThings ... Someone called for pest control?	2015-04-04 20:58:07 +11:00
Jordie	8d2f92cdd3	Merge pull request #8683 from AnturK/pickets ... Adds Picket Signs	2015-04-04 20:57:56 +11:00
Jordie	20ed6aada5	Merge pull request #8668 from ACCount12/syndieboxes ... Toolboxes & welders update	2015-04-04 20:57:15 +11:00
kingofkosmos	2e4a8fcce8	Recieve --> receive grammarfix ... Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix. Fixes #8576 Fixes #8504	2015-04-03 19:42:34 +03:00
danno "big fucking moron" gonzales	cd3f2516e0	Update PDA.dm ... i fucked up	2015-04-02 16:42:14 -04:00
dannno	fcd5938545	Merge branch 'master' of https://github.com/tgstation/-tg-station into sadclown	2015-04-02 16:30:08 -04:00
Artur	3ff5980e85	- Adds Picket Signs	2015-04-02 18:23:17 +02:00
dannno	6cba1d829c	a buhhhhhh buhhhhhhhhhh	2015-04-02 10:21:06 -04:00
Jordie	57e1274353	Merge pull request #8624 from Cheridan/day42_betsoff ... Day Who-Knows: Bar Gambling Expansion!	2015-04-02 20:15:18 +11:00
ACCount12	cda61c1075	Welder&toolboxes update	2015-04-01 10:43:22 +12:00
dannno	a2dfdc8f7b	sad trombone for clown pda	2015-03-31 14:13:48 -04:00
Swag McYolosteinen	d8c588867a	Merge pull request #8634 from sawu-tg/master ... See #7217	2015-03-31 19:40:33 +02:00
ACCount12	f10d0df8cf	Merge remote-tracking branch 'origin/master' into mining	2015-03-31 18:31:12 +12:00
ACCount12	1c219f0ebe	A lot of stuff	2015-03-31 18:30:09 +12:00
Cheridan	9606763e5f	Merge pull request #8583 from Fayrik/CentcomExpansion ... Centcom Two: It's better now, I swear.	2015-03-30 21:35:19 -05:00
phil235	0cef9e5539	Merge pull request #8198 from Xhuis/cigar_cases ... Adds cigar cases	2015-03-30 18:47:46 +02:00
Sawu	bfd0436324	See #7217 ... * Spraycans are given to Revheads * Spraycans act as instant use crayons. * Spraycans can be used on walls. * Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner) (Old pictures, there is now only one can that changes color)    	2015-03-31 02:26:05 +11:00
Fayrik	9b834fca7a	Look at all these bugs that no longer exist!	2015-03-30 03:36:24 +01:00
Cheridan	884e9e3774	Day Who-Knows: Bar Gambling Expansion! ... Space cash is stacks Adds dealer table to map	2015-03-29 18:09:54 -05:00
Jordie	8113c2a1f0	Merge pull request #8483 from xxalpha/c4fix ... Fixes the C4 being planted on the DA.	2015-03-30 01:21:52 +11:00
Jordie	c8e0c16d09	Merge pull request #8520 from MrPerson/effect_cleanup ... Effect pooling	2015-03-30 01:21:40 +11:00
Fayrik	7336e6ecb8	Call Centcom! ERTs got fixed!	2015-03-29 03:54:54 +01:00
Fayrik	4f43fff199	Issue fixes! All that, and more!	2015-03-29 03:54:41 +01:00
xxalpha	55b81363cc	Merge remote-tracking branch 'upstream/master' into hardjet ... Conflicts: code/modules/clothing/spacesuits/hardsuit.dm	2015-03-27 19:35:10 +00:00
Cheridan	cb23548768	Merge pull request #8533 from Jordie0608/greatpermitsbringgreatweightresponsibility ... Fixes #8527, construction permit weight	2015-03-27 14:04:38 -05:00
Cheridan	17067d9021	Merge pull request #8508 from phil235/SlimeAnimal ... Life refactor and slime as animal	2015-03-27 13:38:16 -05:00
Jordie	a86b757d93	Merge pull request #8291 from Xhuis/nerf_thermal_vision ... Nerfs changeling augmented eyesight	2015-03-26 13:01:25 +11:00
phil235	1b3eb49a1d	Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ... Conflicts: code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/carbon/slime/slime.dm code/modules/mob/living/simple_animal/slime/say.dm	2015-03-26 02:31:06 +01:00
hornygranny	e92fe6c333	Merge pull request #8495 from dannno/hahaobjectionxd ... adds hammer and gavel	2015-03-25 16:13:39 -07:00
Jordie0608	461ea87bdc	construction permit's w_class to 1	2015-03-25 16:52:09 +11:00
Jordie	0e57fc6941	Merge pull request #8488 from Miauw62/whatsthedifferenceanyway ... Adds a verb_exclaim var. Fixes #8478.	2015-03-25 16:31:16 +11:00
Jordie	ff90e1599c	Merge pull request #8320 from AnturK/headcrabs ... Adds Headcrabs!	2015-03-25 16:31:00 +11:00
Jordie	9a217503aa	Merge pull request #8451 from Fayrik/FoamForceFuckYeah ... Foam force fuck yeah!	2015-03-25 16:30:42 +11:00
Jordie	fde0eecce8	Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer ... Instrument tweaks	2015-03-25 16:29:29 +11:00
Jordie	0cbcda509d	Merge pull request #8448 from AnturK/gothisway ... Adds arrow graffiti	2015-03-25 16:29:15 +11:00
dannno	a37ac1d600	warning span for gavel	2015-03-24 22:53:11 -04:00
MrPerson	b6c71dc50d	Effect pooling ... obj/effect/effect all pool themselves. PoolOrNew() can now be passed a type and a list instead of a type and a location. In that case, the list will be passed to New() via arglist(). RCD's now delete their spark system and properly garbage collect.	2015-03-24 11:44:49 -07:00
AnturK	eadfecd552	- Makes body_egg parent for alien embryos/changeling eggs	2015-03-24 17:54:20 +01:00
Jordie	59af7cfd42	Merge pull request #8323 from Mandurrrh/miningborgupgrade ... Adds a cyborg upgrade module for the satchel of holding.	2015-03-24 16:40:52 +11:00
hornygranny	b73dd39854	Merge pull request #8436 from phil235/VendMachineCoinItemsFix ... Fixes vending machines starting with no coin or hacked items.	2015-03-23 16:33:26 -07:00
phil235	ffd711c26f	Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ... Conflicts: code/modules/mob/living/carbon/life.dm code/modules/mob/living/carbon/slime/slime.dm code/modules/mob/living/simple_animal/friendly/corgi.dm code/modules/mob/living/simple_animal/slime/say.dm code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm	2015-03-23 16:51:03 +01:00
dannno	365c36c1e0	repair gavel syntax	2015-03-22 20:36:10 -04:00
dannno	3254142b21	adds hammer and gavel	2015-03-22 20:22:27 -04:00
Miauw	ba2a1c8f19	Adds a verb_exclaim var. Fixes #8478. ... Also makes saymods transmitted through the radio system for upcoming NTSL integration.	2015-03-22 18:55:59 +01:00