4811 Commits

Author	SHA1	Message	Date
Cheridan	c5f6f5ff2c	Merge pull request #8812 from Jalleo/Removal ... Removal of empty file	2015-04-08 08:44:43 -05:00
Cheridan	f537b43108	Merge pull request #8789 from phil235/BeartrapFix ... Pull, resist, beartraps	2015-04-08 08:38:01 -05:00
Jordie0608	ad33641101	Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard ... Conflicts: code/game/objects/structures/crates_lockers/closets/secure/freezer.dm code/game/objects/structures/crates_lockers/closets/secure/medical.dm icons/obj/closet.dmi	2015-04-08 22:51:45 +10:00
Jordie0608	ffbef1f7d9	inversed check fix	2015-04-08 16:22:51 +10:00
Jordie0608	60cf76c881	fixes	2015-04-08 16:11:56 +10:00
Jordie0608	37277f66e7	pre-map compile	2015-04-08 15:40:41 +10:00
Iamgoofball	c06ad7e6b8	moved process() to datum. made /datum/reagents/ process instead of the containers.	2015-04-07 17:13:59 -07:00
Iamgoofball	54154bec12	Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive	2015-04-07 16:21:07 -07:00
phil235	6b83575b28	Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix ... Conflicts: code/modules/mob/living/living.dm	2015-04-07 20:27:37 +02:00
phil235	34a2b3be5b	Flying animals no longer triggers mines and mousetraps. ... Space carps are flying animals now. Adding changelog	2015-04-07 20:20:29 +02:00
blah	af99eea983	okay	2015-04-07 18:57:30 +01:00
hornygranny	e957233907	Merge pull request #8772 from MrPerson/foam_fixarooney ... Fixes cleaner grenades	2015-04-06 16:09:35 -07:00
phil235	1f6a6b0e8c	Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix ... Conflicts: code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm code/game/objects/structures/stool_bed_chair_nest/bed.dm	2015-04-06 19:38:51 +02:00
phil235	8499413649	Makes living/verb/resist more object oriented. ... Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code) Rewrites beartrap/Crossed() to have less istype checks. Adds a flying var to simple animals (used in bear trap code) Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.	2015-04-06 18:45:37 +02:00
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
MrPerson	94c0c1598d	Fixes cleaner grenades ... Fixes #8757 Default for locate is "in world"!	2015-04-05 16:55:17 -07: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	3bb6cc8af9	Merge pull request #8625 from xxalpha/cyberplus ... Cyber Implants +	2015-04-04 20:57:48 +11:00
Jordie	20ed6aada5	Merge pull request #8668 from ACCount12/syndieboxes ... Toolboxes & welders update	2015-04-04 20:57:15 +11:00
xxalpha	7ec043a542	Added medical hud implant to CMO locker. Added chest implant sprites.	2015-04-04 00:56:06 +01:00
Remie Richards	862657bd7c	Merge pull request #8421 from dannno/guncases ... gun lockers	2015-04-03 18:40:40 +01:00
danno "big fucking moron" gonzales	1f94f2fe27	Update guncase.dm ... change 4 to capacity	2015-04-03 13:19:45 -04:00
danno "big fucking moron" gonzales	8de848eccb	Update guncase.dm	2015-04-03 13:16:25 -04: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	a8a2ffc123	Merge pull request #8662 from phil235/AddBloodFix ... Fixes lack of dna in old blood.	2015-04-02 20:25:38 +11: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
phil235	0b403b3b03	Fixes lack of dna in old blood. ... Fixes some comments about blood procs in atoms.dm Small tweak in xeno blood blood_DNA.	2015-03-31 19:48:44 +02:00
Swag McYolosteinen	d8c588867a	Merge pull request #8634 from sawu-tg/master ... See #7217	2015-03-31 19:40:33 +02:00
dannno	4051efc3a9	Proper UI for gun lockers	2015-03-31 12:54:24 -04:00
Jordie	005c519b94	Merge pull request #8622 from phil235/TableclimbKnockFix ... Fixes tableclimber knocking themself off the table when clicking it mid-climb	2015-03-31 22:06:51 +11: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	67d9f77ea9	Merge pull request #8600 from phil235/AlienNestFixing ... Fixes alien nest buckling	2015-03-31 00:06:14 -05: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	12a729adcd	Fixes many instances of lying mob getting shifted up (pixel_y reset to 0) by adding a lying_pixel_offset var to mob/living. ... Removes the delay when toggling resting, sleeping and pouncing, the mob sprite will now update instantly.	2015-03-30 23:14:21 +02: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