1109 Commits

Author	SHA1	Message	Date
joep van der velden	09bac34890	fixed the rescue jaw not spawning... guys really?	2018-11-26 19:28:05 +01:00
tigercat2000	d02d1bd537	Robotic ears for I{P,R}C's, slime people don't need ear organs	2018-11-25 06:56:12 -08:00
Granodd	4b1ee1eeb6	Removing the mass spectrometer and replacing it with the reagent scanner.	2018-11-23 19:48:18 -05:00
datlo	8070b9f87a	change real names of some strange objects	2018-11-22 12:38:27 +00:00
warior4356	9be0a83269	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill	2018-11-08 01:58:53 -08:00
Fox McCloud	ecb9c11433	Updates Components Again	2018-11-02 16:23:46 -04:00
warior4356	0ee51bdcc2	Reverts maps. Fixes conflict.	2018-10-31 19:13:22 -07:00
warior4356	b6d5bccd54	Fixes code bugs	2018-10-31 17:32:35 -07:00
warior4356	13d927c10e	Drills implimented	2018-10-29 01:10:10 -07:00
variableundefined	4889c3a1a5	Merge pull request #9081 from tigercat2000/multivis ... PiP Multivis	2018-10-25 09:45:02 +08:00
dovydas12345	a8b0bbae47	Better name and extra requirements!	2018-10-24 14:35:12 +03:00
tigercat2000	8ef1b97f45	Merge remote-tracking branch 'upstream/master' into multivis ... # Conflicts: # .travis.yml # _maps/map_files/MetaStation/z2.dmm # _maps/map_files/cyberiad/z2.dmm # code/game/atoms_movable.dm # code/game/machinery/camera/camera.dm # code/modules/mob/living/silicon/ai/ai.dm # code/modules/mob/living/silicon/ai/freelook/eye.dm	2018-10-23 17:41:41 -07:00
dovydas12345	45aab00dbf	Update misc_designs.dm	2018-10-23 22:22:17 +03:00
dovydas12345	3cfc7a42fe	Adds data disk to misc designs	2018-10-23 22:22:07 +03:00
variableundefined	600de8ba24	Deconflict 1	2018-10-21 07:56:55 +08:00
Mark Mak	690d7bd0d4	Merge pull request #9732 from TDSSS/ody-stuff ... New mech equipment: Jaws of life for Ody/Firefighter Ripley	2018-10-19 06:54:38 +08:00
variableundefined	65c246c1c9	TG container_type refactor	2018-10-13 08:20:52 +08:00
variableundefined	4de5284557	Merge pull request #9677 from DesolateG/global ... Updates global lists to the global var subsystem.	2018-10-12 13:18:28 +08:00
Desolate	f7627d2fcb	Resolves conflicts.	2018-10-11 05:36:22 -05:00
TDSSS	f205c03ea7	Spacing issues fixed	2018-10-11 09:12:52 +02:00
variableundefined	6b1b38d4f1	Port over tg ore stack and stack merging ... Meta Birbfix Maxi Re-add automatic satchel ore pickup (oops) Mecha formatting re	2018-10-09 10:06:03 +08:00
Purpose	4d7dd5a6c9	dayum dats defined	2018-10-08 22:48:00 +01:00
TDSSS	9d6e1bd051	rename, changed chem, replaced usr with user	2018-10-08 13:27:16 +02:00
Desolate	4c062212ab	refactors global lists.	2018-10-06 08:02:45 -05:00
TDSSS	c949829183	Emagging added.	2018-10-05 01:25:53 +02:00
Desolate	c974e29a3c	global lists global defined	2018-10-02 15:52:46 -05:00
TDSSS	f16168aa06	Fixed data management screen, research deletion.	2018-09-30 15:13:05 +02:00
TDSSS	13923d0c79	Fixes typo	2018-09-30 13:45:29 +02:00
variableundefined	68c35ccced	Merge pull request #9527 from Ty-Omaha/muh-art ... Fixes half the server crashing, removes canvases	2018-09-29 07:49:30 +08:00
variableundefined	7daba3396c	Merge pull request #9372 from Kyep/pod_fix ... Fixes pod fab bug	2018-09-28 15:02:57 +08:00
Purpose	037f215d16	updates vars to use the defines	2018-09-16 01:22:57 +01:00
Ty-Omaha	ae4e015868	removes canvases 3	2018-09-12 02:41:06 -04:00
Ty-Omaha	52ab5abb0c	canvas removal	2018-09-12 02:15:15 -04:00
Crazy Lemon	599c58fb53	Merge pull request #9369 from variableundefined/Analyzer ... Analyser > Analyzer	2018-09-04 09:04:14 -07:00
Unknown	62c7ba1f80	Merge remote-tracking branch 'upstream/master' into Memes	2018-08-29 19:23:06 +02:00
Crazy Lemon	4184fdac89	Merge pull request #9445 from variableundefined/RuntimeAdminName ... Fixes wire cutting runtime and two potential key_name runtime	2018-08-29 07:59:41 -07:00
variableundefined	8302024201	Fixes wire cutting runtime and other potential runtime.	2018-08-29 20:02:42 +08:00
Kyep	02bd1108a2	fixes pod fab bug	2018-08-16 07:18:05 -07:00
variableundefined	d2cf3353a8	Analyser > Analyzer	2018-08-16 21:01:13 +08:00
Alffd	4ff5450832	Its not a type if I don't know how to spell.	2018-08-14 00:53:40 -04:00
Alffd	e49bcd4d15	Add noise sensor and add muzzles to protolathe	2018-08-14 00:53:39 -04:00
Superhats	2ae12ac2f7	Merge pull request #1 from ParadiseSS13/master ... update lmao	2018-08-10 10:53:02 +02:00
Fox McCloud	3193d599cb	Medical Hypospray	2018-08-02 23:39:15 -04:00
Crazylemon64	7b4dd7eb19	Cleans out various macro redefinitions or useless use of syntax	2018-07-30 23:24:35 -07:00
Fox McCloud	ccef188180	new tools	2018-07-24 23:14:05 -04:00
Superhats	d94d908d1b	Update medical_designs.dm	2018-07-18 14:17:16 +02:00
Superhats	ef30365338	discounts	2018-07-17 10:50:28 +02:00
Superhats	7d18c41606	F I X part 2	2018-07-17 10:49:21 +02:00
Superhats	b217d8f696	F I X	2018-07-16 23:58:30 +02:00
Superhats	8d8333ed77	Moar implants	2018-07-16 23:11:15 +02:00