596 Commits

Author	SHA1	Message	Date
Jordie	3e6f0c87bf	Merge pull request #11731 from Fox-McCloud/Impropermaterials ... Fixes Consistency Issue with Materials	2015-09-13 23:13:22 +10:00
Jordie	e718214a67	Merge pull request #11734 from Menshin/sheets_inserting_safety_checks ... Adds boundary checks for stack sheets inserting	2015-09-13 23:13:04 +10:00
Fox-McCloud	9b668de7bb	Merge remote-tracking branch 'upstream/master' into Impropermaterials	2015-09-13 08:58:40 -04:00
Menshin	89ce4e112d	Stored the material name in case the stack was deleted after the sleep() when dealing with overlays.	2015-09-13 01:57:21 +02:00
bear1ake	c52c4a5346	Merge remote-tracking branch 'tgstation/master' into point-zero ... Conflicts: code/modules/research/protolathe.dm	2015-09-12 21:07:40 +09:00
Menshin	ce2ee15b57	* Added boundary checks for stack sheets inserting (fixes #11732) ... * Limited material inserting to stack sheets for the protolathe and banana shoes	2015-09-12 12:11:57 +02:00
Fox-McCloud	89fa65c127	Fixes Consistency Issue with Materials	2015-09-12 03:51:33 -04:00
Razharas	f9a01d1365	Merge pull request #11580 from xxalpha/protocontainer ... Changed protolathe code to use material container.	2015-09-12 08:56:47 +03:00
Razharas	4f9e6a33e0	Merge pull request #11678 from GunHog/ChemHeaterBoardFix ... Fixes missing chem heater board design	2015-09-12 08:53:30 +03:00
xxalpha	28889d2b6a	Changed protolathe code to use material container. ... Clean proc, typo fix Standard sheet values	2015-09-11 12:39:32 +01:00
bear1ake	f697ae90f5	removes a bunch of .0	2015-09-10 20:57:30 +09:00
GunHog	1d9b59e28b	Fixes missing chem heater board design ... - Fixes #11673 (deleted a tab)	2015-09-09 12:53:00 -05:00
Cheridan	304d91fa2c	Merge pull request #11606 from Firecage/gunnames ... This gives most projectile guns less generic names.	2015-09-09 10:45:18 -05:00
bgobandit	dc16dfbcc2	Fixes/tweaks slime potions.	2015-09-07 09:48:31 -04:00
Firecage	9c341fb128	This gives most projectile guns less generic names.	2015-09-06 13:43:38 +02:00
Cheridan	a816ff5f8f	Merge pull request #11385 from Aranclanos/extrapug ... Fixes pugs not following their tail.	2015-09-04 23:20:25 -05:00
c0	df7386a4ec	Assemblies update	2015-09-04 11:22:37 +03:00
Razharas	6724e65aae	Merge pull request #11270 from ExcessiveUseOfCobblestone/master ... Simple RnD tweaks	2015-09-01 16:40:25 +03:00
Razharas	1582526447	Merge pull request #11166 from GunHog/Sawumakesmewanttocry ... E.X.P.E.R.I-MENTOR fixes	2015-09-01 16:06:58 +03:00
Razharas	bfbe4e997e	Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE ... Makes all Destroy() procs return properly	2015-09-01 15:54:18 +03:00
Razharas	610905bb55	Merge pull request #11342 from Fox-McCloud/emitterboard ... Producible Emitter Boards at R&D	2015-09-01 10:06:03 +03:00
ExcessiveUseOfCobblestone	d85cae38bb	Moved to Auto	2015-08-31 15:56:42 -04:00
ExcessiveUseOfCobblestone	5dee17a846	Merge remote-tracking branch 'tgstation/master'	2015-08-31 15:54:06 -04:00
duncathan	51c09f16bf	makes all Destroy()'s return properly	2015-08-31 00:21:01 -06:00
Cheridan	529059c3f1	Merge pull request #11459 from bgobandit/itsafuckingpotionfuck ... Refactors slime potions.	2015-08-30 20:34:45 -05:00
Razharas	d1c417e996	Merge pull request #11416 from xxalpha/airlockQDEL ... Added qdel(wires) to a bunch of objects Destroy proc.	2015-08-31 00:08:27 +03:00
Cheridan	32d74ad19c	Merge pull request #11433 from Core0verload/framed ... Buttons and wall frames rework	2015-08-30 13:43:19 -05:00
c0	97b792bbc3	Changed some circuits paths to reduce copypasta	2015-08-30 16:58:13 +03:00
bgobandit	edf918282e	Tweaks text and numbers.	2015-08-29 19:54:44 -04:00
bgobandit	14d5cb7340	Refactors slime potions.	2015-08-29 02:42:54 -04:00
ExcessiveUseOfCobblestone	4c47a7cf5e	Merge remote-tracking branch 'tgstation/master'	2015-08-27 20:02:02 -04:00
c0	8474086bce	Buttons and wall frames rework	2015-08-28 02:01:49 +03:00
xxalpha	19947d4fa0	Added qdel(wires) to a bunch of objects Destroy proc. ... Return ..()	2015-08-27 11:10:58 +01:00
Aranclanos	460c2c290c	Fixes the admin message not appearing under certain conditions when the rapid dupe experimentator relic is used. ... All objects from said relic will spawn at the same time now.	2015-08-25 05:31:02 -03:00
Aranclanos	0d1d321651	Fixes pugs not following their tail. ... The staff of change won't create invisible pugs anymore, same with the experimentator relics. Removes a leftlover pug typepath.	2015-08-25 05:28:58 -03:00
Fox-McCloud	bc0de1c5bf	Producible Emitter Boards at R&D	2015-08-23 15:41:18 -04:00
Swag McYolosteinen	825b5794c7	Merge pull request #11239 from Firecage/del2qdel ... del() to qdel()	2015-08-19 11:50:24 +02:00
ExcessiveUseOfCobblestone	928d7e874d	For you Scones [Telesci stuff moved to Tele Sec.] ... but I still have a crush on pap sooo >.>	2015-08-18 19:28:40 -04:00
ExcessiveUseOfCobblestone	e800add01b	OK WE FIXED IT BOYS ... fuck the DME amirite	2015-08-18 15:50:09 -04:00
ExcessiveUseOfCobblestone	01bf5472eb	Revert "Moves Cloning Machines/Comps to Medical Section" ... This reverts commit 98561a60c1.	2015-08-18 15:45:51 -04:00
ExcessiveUseOfCobblestone	f7fff52b33	Merge remote-tracking branch 'tgstation/master'	2015-08-18 15:39:48 -04:00
Remie Richards	f77047b640	Merge pull request #11185 from Cheridan/brycepaxsbrain ... Logging Syntax Improvement	2015-08-18 20:24:42 +01:00
Remie Richards	3891e67d8d	Merge pull request #11162 from Core0verload/rnd-implants ... RnD update	2015-08-18 20:20:12 +01:00
ExcessiveUseOfCobblestone	526dec8222	Merge remote-tracking branch 'tgstation/master'	2015-08-17 16:58:09 -04:00
Firecage	bf13763e3b	Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel	2015-08-16 23:34:03 +02:00
Firecage	dfae1e0b53	Changes a lot of del() to qdel()	2015-08-16 23:33:22 +02:00
phil235	5539689f3a	Merge pull request #11043 from KorPhaeron/moreweebshit ... Timestop for Wizards	2015-08-16 11:04:47 +02:00
KorPhaeron	0abd08cb92	Did it the way Phil wanted it	2015-08-15 22:00:15 -05:00
Liam	6d6fcddc67	Edits Required Tech	2015-08-15 19:15:32 -04:00
Liam	1ee8f0ce10	Adds Health Analyzer to Protolathe	2015-08-15 19:05:53 -04:00