4765 Commits

Author	SHA1	Message	Date
Jordie	57e1274353	Merge pull request #8624 from Cheridan/day42_betsoff ... Day Who-Knows: Bar Gambling Expansion!	2015-04-02 20:15:18 +11:00
Swag McYolosteinen	d8c588867a	Merge pull request #8634 from sawu-tg/master ... See #7217	2015-03-31 19:40:33 +02: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	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
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
phil235	0745219d06	Fixes tableclimber knocking themself off the table when clicking it mid-climb.	2015-03-29 23:57:47 +02:00
Jordie	373516e522	Merge pull request #8579 from phil235/WelderInClosetFix ... Fixes not being able to put unlit welding tool in open closets	2015-03-30 01:22:35 +11: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
phil235	2ef01a61c5	Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free. ... Fixes alien nest buckling pixel offset. Removes resist unbuckling 'success' message so there's not two unbuckling messages. Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).	2015-03-28 23:02:44 +01:00
phil235	e80a50f1c7	Fixes not being able to put unlit welding tool in open closets and not being able to open a closet with an unlit welding tool in your hand.	2015-03-28 00:12:06 +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
ACCount12	e37121d750	ntstation mining update	2015-03-27 15:47:01 +12: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
phil235	92b0f9f4cd	Adding a changelog. ... Some work on death() procs of many animals. Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ). Some work on slime feeding procs. Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).	2015-03-26 02:23:39 +01:00
hornygranny	e92fe6c333	Merge pull request #8495 from dannno/hahaobjectionxd ... adds hammer and gavel	2015-03-25 16:13:39 -07:00
pudl	69924a15be	plasma/ripley update	2015-03-25 18:06:26 -05: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
AnturK	88f2eda81e	- Headcrabs ... - Changelog & Name - Description - Removes debug message - Fixes cavity surgery removal Oops - Headslug sprites courtesy of ZyloWalsh - Squash	2015-03-24 12:53:13 +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
hornygranny	506da51f96	Merge pull request #8455 from Incoming5643/how_bout_I_get_you_some_stones ... Adds click delay to smacking up statues	2015-03-23 16:31:53 -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
Cheridan	beacf0cf4a	Merge pull request #8349 from MrPerson/qdel_reagents_hopefully ... Fix reagent garbage collection hopefully	2015-03-23 08:55:11 -05: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
Swag McYolosteinen	53e40ec315	Merge pull request #8427 from Cheridan/day3_collars ... Event Day 3 - Pet Collars!	2015-03-22 19:37:12 +01: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
Nienhaus	9486248553	Merge pull request #8440 from dannno/coperite ... GAR GLASSES	2015-03-22 12:05:21 -05:00
xxalpha	973f374276	Fixed the C4 being planted on the DA.	2015-03-22 16:26:58 +00:00
MrPerson	2fa6457130	Added a preference toggle for hearing musical instruments	2015-03-22 01:54:30 -07:00
MrPerson	9229f72573	Fix up certain chemicals to not overwrite Del(). Meh. ... Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully Conflicts: code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm	2015-03-21 23:04:53 -07:00