88 Commits

Author	SHA1	Message	Date
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
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
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
Pennwick	568c088dd0	Update machine_designs.dm ... Added Chem Master Board to circuit Imprinter	2015-03-21 18:23:36 -05: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
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
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
paprka	1d552123dc	hos gun revert	2015-02-24 21:54:48 -08:00
paprka	393123b50b	Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs ... Conflicts: code/modules/projectiles/gun.dm icons/obj/guns/energy.dmi	2015-02-24 20:03:33 -08:00
hornygranny	c0c8a739e2	Merge pull request #7721 from paprka/miening ... Mining & mine-related chem changes	2015-02-22 20:17:24 -08:00
paprka	074a139576	Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs ... Conflicts: icons/obj/guns/energy.dmi	2015-02-18 02:29:07 -08:00
paprka	71758715fa	some typo fixes	2015-02-15 13:33:15 -08:00
paprka	8b12b14f59	hospistol and disabler stun revolver	2015-02-15 13:31:31 -08:00
paprka	b2071bfdbf	borg updates	2015-02-14 17:38:17 -08:00
paprka	88760896ad	initial commit	2015-02-13 20:59:39 -08:00
paprka	54040d9867	stun changes and stun revolver	2015-02-13 09:26:31 -08:00
GunHog	0b0737b292	Merge remote-tracking branch 'remotes/origin/master' into IonCarbinesFor-k-ommandos ... Conflicts: icons/mob/belt.dmi icons/obj/guns/energy.dmi	2015-02-12 09:08:31 -06:00
GunHog	5786626c87	Introducing the Ion Carbine! ... - Adds the Ion Carbine, a compact version of the Ion Rifle that users can carry on their belt or in a regular backpack. - Adds the Ion Carbine to R&D, replacing the Ion Rifle. - Ion Rifle now starts with a pin installed as it can no longer be made in Science. - The Ion Rifle and Ion Carbine can now accept Seclites as an attachment.	2015-02-10 18:03:30 -06:00
paprka	3e61bba236	defib changes	2015-02-08 17:06:34 -08:00
Steelpoint	92f5bc2dc8	MergeConflict	2015-02-06 13:21:23 +08:00
paprka	26873cd973	changes combat requirement to materials	2015-02-04 13:12:43 -08:00
paprka	b7994d7c2d	research and different mat requirements for borg upgrades	2015-02-04 13:01:05 -08:00
Firecage	72af5ffb8f	Did what HG said to do with Protosmg firing pin	2015-01-22 08:08:14 +02:00
tkdrg	3c2f10e401	Fixes heaters breaking chem dispenser research	2015-01-17 16:34:00 -03:00
Remie Richards	3867079e51	Merge pull request #7068 from tkdrg/toast ... Adds chemical heater nanoUI & construction/upgrade	2015-01-17 01:29:13 +00:00
paprka	ab7d50c90e	Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess ... Conflicts: code/game/gamemodes/wizard/rightandwrong.dm code/modules/projectiles/guns/projectile/launchers.dm code/modules/projectiles/guns/projectile/shotgun.dm code/modules/research/designs/weapon_designs.dm icons/obj/gun.dmi	2015-01-15 21:56:23 -08:00
Cheridan	5f46ebe2b9	Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned	2015-01-15 16:14:27 -06:00
tkdrg	4a6df00494	Adds chemical heater nanoUI & construction/upgrade ... Also buffs the heater to heat/cool 10 kelvin per tick per upgrade level. Fixes #7040 Fixes #7060	2015-01-14 22:41:53 -03:00
paprka	8bde2dea03	crossbow, speargun, and grenade updates	2015-01-13 20:00:58 -08:00
Cheridan	03e1d0d60a	-Adds firing pin box define ... -Examining a gun now shows its pin -You can now emag a firing pin to make it function without checks. -Loyalty pins unable to be constructed	2015-01-12 21:21:34 -06:00
phil235	9162c1b519	Merge branch 'master' of https://github.com/tgstation/-tg-station into LibraryComputer ... Conflicts: icons/obj/library.dmi	2015-01-11 15:52:07 +01:00
Cheridan	96b84d8bd2	Update weapon_designs.dm ... Change pin design path	2015-01-10 11:41:12 -06:00
Cheridan	c35c1bc48e	Update weapon_designs.dm ... Proper ids for pins	2015-01-10 01:28:01 -06:00
Cheridan	0956a86c22	Firing Pin System - The Lockbox Solution	2015-01-09 18:49:02 -06:00
hornygranny	56bad0f7ce	Merge pull request #6747 from paprka/gunchangesv2baby ... Further changes to the ranged stun system	2015-01-08 16:09:37 -08:00
Sawu	75335fcd08	Fixes missing Category	2015-01-08 04:21:17 +11:00