Commit Graph

113 Commits

Author SHA1 Message Date
Razharas e6b738734a Merge pull request #8876 from xxalpha/fixfixfix
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
Iamgoofball 81fcaa9344 PSHOOM 2015-06-08 20:38:50 -07:00
Iamgoofball b5fc2ca46b committed balance ideas and NEW SPRITE FROM WJ 2015-06-08 19:01:43 -07:00
Iamgoofball 9919e6a0cf INTRODUCING THE BLUESPACE RPED 2015-06-08 17:07:19 -07:00
Iamgoofball 3c1a0dd0d5 SMARTFRIDGE, SEED EXTRACTOR, and MONKEY RECYCLER are now buildable. ORE REDEMPTION MACHINE can now be upgraded. 2015-06-06 12:47:11 -07:00
Iamgoofball e1cfbdaed4 RECYCLER AND HOLOGRAPH PADS ARE BUILDABLE and bugfixes 2015-06-06 01:35:01 -07:00
Iamgoofball 467cc12ae5 fixes 2015-06-06 00:33:02 -07:00
Iamgoofball b65c7a36df Upgrade Update: Bluespace Boogaloo 2015-06-05 23:56:09 -07:00
Cheridan 33cbb5ebd9 Merge pull request #9667 from GunHog/Cargo_Needs_Love
Adds Destination Tagger and Hand Labeler to Autolathe
2015-06-04 20:29:13 -05:00
Firecage 3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
xxalpha 662af7174f Merge remote-tracking branch 'upstream/master' into fixfixfix
Conflicts:
	icons/obj/storage.dmi
2015-05-29 21:45:18 +01:00
GunHog 3b75f04cb7 Autolathe Destination Tagger and Hand Labeler
Adds Destination Tagger and Hand Labeler to autolathe.
2015-05-27 12:49:36 -05:00
xxalpha f0351e1890 Tweaked uplink prices.
Undo X-ray requirement change.
2015-05-15 21:54:08 +01:00
Remie Richards e5f034fc0d Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
Cheridan 36df27ad53 Merge pull request #9205 from phil235/SpiderKnifeFixes
Spiders and kitchen tool fixes
2015-04-29 08:23:10 -05:00
phil235 752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02:00
TheVekter 07afe76f8c Fixes #9098 and #9077. 2015-04-27 01:41:12 -05:00
GunHog aa59485a58 Positronic Brains!
-Adds positronic brains
- Fixes a runtime in mechs for pilots without DNA
2015-04-24 09:23:20 -05:00
GunHog cf6e5ff1cd Adds APC boards to Autolathe
- I have also drawn up a changelog, written in my own blood to appease
the God of Changelogs.
2015-04-23 12:44:15 -05:00
xxalpha 32746ba73a Merge remote-tracking branch 'upstream/master' into fixfixfix 2015-04-22 18:03:35 +01:00
Jordie 1f9351c3fd Merge pull request #8925 from xxalpha/ripped
Low pressure environment Ripley buff & Mecha Mining Scanner.
2015-04-22 17:49:57 +10:00
xxalpha 1683581578 Omelette du fromage. 2015-04-18 23:03:04 +01:00
xxalpha b8a884a7c1 Added Exosuit Mining Scanner 2015-04-12 21:13:29 +01:00
xxalpha de9e363a74 Increased Thermals Implant tech requirements (syndicate + 1). 2015-04-10 19:15:39 +01:00
xxalpha e11a913f23 Fixed Nutriment printing bug. Added new Reviver implant. 2015-04-10 16:30:39 +01: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
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)

![can1](https://cloud.githubusercontent.com/assets/3829126/5812999/c3992e38-a0c9-11e4-8620-3e1ecbc97630.PNG)
![can2](https://cloud.githubusercontent.com/assets/3829126/5813002/c92d56d0-a0c9-11e4-8592-6ae15f594ca8.PNG)
![cap3](https://cloud.githubusercontent.com/assets/3829126/5825994/88a9260a-a143-11e4-8cd7-cd4491b0db2a.PNG)
![can4](https://cloud.githubusercontent.com/assets/3829126/5828055/28766ffc-a154-11e4-8bfb-f8475c84c6a4.PNG)
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