Erthilo 8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi

2012-05-31 15:09:35 +01:00

..

implants

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

AI_modules.dm

TG: Sanitized a large number of input()s.

2012-05-26 00:09:56 +01:00

cameras.dm

TG: - Standardized var definition for RND and radio code (possibly some other stuff)

2012-05-28 23:37:43 +01:00

cards_ids.dm

Ported Animus Station's currency system, credit to @EditorRUS. ATM's now require a pin which is generated and stored in mob notes. Space cash renamed to stack of credits, and same value credits can be stacked together. Credits are generated randomly between 500 to 2000 credits. Credits or coins can be inserted and converted to credits. Still not used for anything!

2012-05-17 20:50:47 +01:00

cigs_lighters.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

clown_items.dm

Fixed metroids being slipped and stepping in glass shards. Wearing a suit with shoes now protect from glass shards. Surgery can now be done on roller beds, and doing it on normal tables has a slightly higher chance of working.

2012-03-30 05:57:30 +01:00

dna_injector.dm

Properly adds attack logging to a separate attack log. Also adds logging for flashbangs. Config change too!

2012-04-19 20:18:24 +01:00

explosives.dm

TG: Sanitized a large number of input()s.

2012-05-26 00:09:56 +01:00

flamethrower.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

game_kit.dm

Added game kit to crew quarters + Fixed genetics inner shutters

2012-04-08 09:22:14 +03:00

grenades.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

hand_lablers.dm

Made labels able to be stuck on containers (issue #430)

2012-02-18 05:39:30 +10:30

hydroponics.dm

TG: Committing from the Proposed Commit forum:

2012-05-15 00:58:12 +01:00

kitchen.dm

Fix for Abi's fix, thanks to @Sunfall!

2012-05-17 03:11:09 +01:00

manuals.dm

TG: AIs and Juggernauts/Wraiths/Artificers should no longer have random names when

2012-05-06 19:01:01 +01:00

medical.dm

Fixes Tajaran spawning as humans with furry bits. Fixes cyborgs using recharges. Fixes medical messages.

2012-05-23 15:21:54 +01:00

mops_cleaners.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

paint.dm

TG: - Some runtime-prevention tweaks so that impatient coders don't just break

2012-05-29 00:33:25 +01:00

paiwire.dm

pAIs added. Two on station (Crew Quarters, R&D Director's Office) and one on the Derelict.

2011-05-30 19:33:28 +00:00

papers_bins.dm

Stamp removers can now forge stamps as well.

2012-05-07 05:00:25 +01:00

plant_bag.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

RCD.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

RSF.dm

/obj/item/weapon/spacecash change to /obj/item/weapon/money

2012-05-21 23:56:48 +01:00

stungloves.dm

Stunglove overhaul: part two- gloves now lose all insulation when you wire them up.

2011-10-29 18:44:31 +00:00

surgery_limbattachment.dm

Fixes robolimbs surgery.

2012-05-23 17:38:44 +01:00

surgery_tools.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

swords_axes_etc.dm

Properly adds attack logging to a separate attack log. Also adds logging for flashbangs. Config change too!

2012-04-19 20:18:24 +01:00

syndie.dm

WIP on detective work overhaul

2012-01-31 02:01:37 -07:00

table_rack_parts.dm

TG: -r-table parts are now made by using four metal rods on regular table parts.

2012-05-15 01:02:01 +01:00

teleportation.dm

Fixes for a lot of implant things. Fixes some runtimes related to explosive and death alarm implants.

2012-04-10 12:38:34 -07:00

tiles_wires.dm

Adds in limb replacement surgery, robolimbs, and all the crap for them. They can take more damage, require wires and welder to repair, but malfunction when they get more damaged, and explode when destroyed.

2012-04-11 15:42:54 -07:00

tools.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-31 15:09:35 +01:00

twohanded.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

wrappingpaper.dm

TG: Sanitized a large number of input()s.

2012-05-26 00:09:56 +01:00