432 Commits

Author	SHA1	Message	Date
phil235	081bae6740	Fixes broken ui action button for toggling chef apron's sleeves and owl's wings. ... Fixes surviving suicide Fixes suicide damage overlays. Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect) Fixes ninja smoke bomb count. Fixes dead shaved corgi Fixes lipozine still being in code. Fixes flattening boxes requiring them to have their window opened. Fixes armor softening message from disarm attack. Fixes player being forced to play spiders without choosing.	2015-04-14 13:54:36 +02:00
Cheridan	5761ccde0a	Merge pull request #8794 from phil235/KineticAcceleratorNerf ... Nerfs the kinetic accelerator.	2015-04-10 13:56:08 -05:00
hornygranny	761985ce80	Merge pull request #8801 from xxalpha/fixfixfix ... Implant Hotfix	2015-04-09 13:45:32 -07:00
phil235	13baa6e3cb	Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf ... Conflicts: code/modules/projectiles/projectile/special.dm	2015-04-09 17:27:55 +02:00
phil235	7df5998740	Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma.	2015-04-08 03:44:56 +02:00
Iamgoofball	54154bec12	Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive	2015-04-07 16:21:07 -07:00
xxalpha	09067eac4f	Removed Reviver implant. Commented out some implant designs.	2015-04-07 07:52:07 +01:00
phil235	6550016ee6	Merge pull request #8723 from kingofkosmos/grammarfixes ... Recieve --> Receive	2015-04-04 20:00:21 +02:00
Jordie	3bb6cc8af9	Merge pull request #8625 from xxalpha/cyberplus ... Cyber Implants +	2015-04-04 20:57:48 +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
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
xxalpha	c1bf12345e	Added ability for Medical HUDs to detect cybernetic implants.	2015-03-30 17:52:08 +01: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
xxalpha	cc7fa8ed4b	Added two more implants. "Close" surgery now heals damage.	2015-03-29 20:33:45 +01: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
pudl	69924a15be	plasma/ripley update	2015-03-25 18:06:26 -05:00
Jordie	9a217503aa	Merge pull request #8451 from Fayrik/FoamForceFuckYeah ... Foam force fuck yeah!	2015-03-25 16:30:42 +11:00
Jordie	66ab60d5e1	Merge pull request #8476 from Pennwick/master ... Adds Chem Master board	2015-03-25 16:29:41 +11: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
phil235	b78ce020e7	fixing more stuff	2015-03-23 19:47:39 +01:00
phil235	17fb919020	More fixes	2015-03-23 17:11:07 +01: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
Swag McYolosteinen	53e40ec315	Merge pull request #8427 from Cheridan/day3_collars ... Event Day 3 - Pet Collars!	2015-03-22 19:37:12 +01:00
Iamgoofball	434265afa0	Reagent Decals 2: Black Powder Boogaloo	2015-03-22 02:04:31 -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
Pennwick	568c088dd0	Update machine_designs.dm ... Added Chem Master Board to circuit Imprinter	2015-03-21 18:23:36 -05:00
Swag McYolosteinen	afa1b76cde	Merge pull request #8190 from xxalpha/cyberimplants ... Cybernetic Implants	2015-03-21 13:19:26 +01:00
xxalpha	d9921411b8	Changed anti-drop implant emp_act(). Added designs to mech fabricator.	2015-03-21 00:17:27 +00:00
Fayrik	b758992e8c	First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.	2015-03-20 23:02:53 +00:00
xxalpha	69d4536844	Code tweaks. Designs are now in 'Medical'.	2015-03-20 22:57:52 +00:00
phil235	48bbf303da	Fix conflict in xenobiology.dm ... Simplify simple_animal/attackby() more work on slimes.	2015-03-20 22:05:09 +01:00
phil235	aecb365f84	Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ... Conflicts: code/modules/mob/living/carbon/alien/life.dm code/modules/mob/living/carbon/life.dm code/modules/mob/living/carbon/slime/slime.dm code/modules/mob/living/silicon/robot/life.dm code/modules/mob/living/simple_animal/slime/life.dm	2015-03-20 19:32:16 +01:00
phil235	182a3da16a	More work on slimes. Moving xenobiology items to modules/research/xenobiology	2015-03-20 19:17:03 +01:00
xxalpha	a9b18759f2	Fixed HUD examine features.	2015-03-19 19:41:05 +00:00
Cheridan	7149f0382d	Adds Pet Collars! ... Map needs update now	2015-03-18 21:27:21 -05:00
xxalpha	31de411a11	Merge remote-tracking branch 'upstream/master' into cyberimplants ... Conflicts: code/modules/mob/living/carbon/carbon.dm code/modules/mob/mob_defines.dm	2015-03-18 20:11:51 +00:00
GunHog	6032c3d966	Minor Experimentor relic tweaks ... - Nerfs the explosion relic so it can only explode once. - The PetSpray relic now has a chance to destroy itself on use. - Prevents the Experimentor re-rolling the function of a relic. - Added low priority logging for the rest of the relics. - Fixed the relic messages not showing to the user.	2015-03-16 15:57:29 -05:00
MrPerson	7c305305b7	Fix reagent garbage collection hopefully ... I say hopefully because stuff that collects successfully locally likes to fail on sybil.	2015-03-14 16:52:49 -07:00
Cheridan	7e011680ec	Merge pull request #8237 from GunHog/CherryFlavoredPins ... Loyalty Implant Firing Pins	2015-03-13 12:57:28 -05:00
GunHog	1f400f6860	Increases requirements ... Reqs to make it are now Combat 6, Mats 6, Power 3.	2015-03-13 12:15:49 -05:00
Mandurrrh	fb099a64e7	Adds a cyborg upgrade module for the satchel of holding. Also fixes the diamond drill upgrade for borgs not being able to equip the drill with upgrade.	2015-03-12 23:26:02 -04:00
xxalpha	821a967986	Added Research designs for all implants. Added brain implant emp_act().	2015-03-10 23:39:08 +00:00
GunHog	193372b407	Loyalty Implant Firing Pins ... - Allows the construction of Loyalty Pins at Combat tech 5, instead of 10.	2015-03-08 16:46:41 -05:00
norill	3796f32394	fixed improper req_tech "power" -> "powerstorage" in several research designs	2015-03-08 18:23:34 +01:00
Cheridan	95e269e211	Merge pull request #8122 from Xhuis/miners_messiah ... Adds the ore satchel of holding	2015-03-06 15:15:40 -06:00
Xhuis	2499ed82f4	Adds the ore satchel of holding	2015-03-03 07:26:58 -05:00
phil235	d2d0888432	Merge pull request #7726 from xxalpha/traymesons ... Mesons+T-Ray = Engineering Goggles	2015-03-02 19:24:06 +01:00