120 Commits

Author	SHA1	Message	Date
kevinz000	8f577e910a	Merge pull request #9238 from Trilbyspaceclone/surgery_stuff ... Adds two more surgerys - Embalming and Body Rejuvenation	2019-09-07 11:37:13 -07:00
kevinz000	09ed526594	Merge pull request #9089 from Sishen1542/rapid-construction-dabvice ... RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier	2019-09-07 11:35:09 -07:00
TrilbySpaceClone	084b37ae4e	tada	2019-09-04 10:13:32 -04:00
kevinz000	3f6256d945	Update all_nodes.dm	2019-08-21 08:06:08 -07:00
Linzolle	2095a14256	add mining shuttle console to techweb	2019-08-12 13:49:26 -05:00
Sishen	dc66446064	dab dab	2019-08-09 03:19:02 -04:00
Thalpy	5795f6bbe2	Merge branch 'master' into master	2019-08-05 09:09:36 +01:00
Trilbyspaceclone	3bad062c23	Merge branch 'master' into Unmodular	2019-08-05 00:04:44 -04:00
Ghommie	d9a09d7211	Undoes a few things.	2019-07-31 21:23:20 +02:00
Ghommie	ec2a3ea778	Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"	2019-07-31 18:56:00 +02:00
Thalpy	9c7b1dee97	Merge branch 'master' into master	2019-07-15 21:23:04 +01:00
Trilbyspaceclone	2a78caa127	Merge branch 'master' into Unmodular	2019-07-14 18:27:37 -04:00
Trilbyspaceclone	53c61b9050	Merge branch 'master' into Rnd_brakeup	2019-06-23 21:09:53 -04:00
Trilbyspaceclone	063fe4fdef	Merge branch 'master' into Unmodular	2019-06-23 21:06:21 -04:00
Fermi	fdba8c000f	Fixing compiling errors.	2019-06-23 20:03:37 +01:00
Fermi	10109d0fe5	Merge branch 'pr/18'	2019-06-23 19:15:07 +01:00
TrilbySpaseClone	8879cdc24e	Update all_nodes.dm	2019-06-22 14:10:29 -04:00
Thalpy	41eee65b15	Merge branch 'master' into master	2019-06-17 12:18:40 +01:00
Thalpy	1cc0724519	Merge branch 'master' into Dwarf	2019-06-17 12:09:55 +01:00
kevinz000	78c969a9cb	Merge pull request #8584 from Trilbyspaceclone/patch-172 ... Organ Storage box	2019-06-16 19:43:10 -07:00
Trilbyspaceclone	55fbbd8a3f	Merge branch 'master' into Unmodular	2019-06-16 20:02:56 -04:00
TrilbySpaseClone	b45c870ae4	Immodular	2019-06-16 19:58:49 -04:00
kevinz000	d3555d6782	Merge pull request #8243 from Trilbyspaceclone/meteor ... More Meteor defenses	2019-06-16 01:01:43 -07:00
Trilbyspaceclone	f32291146b	Update all_nodes.dm	2019-06-14 12:02:55 -04:00
BlackMajor	7523c86071	Wasn't I supposed to do this in January	2019-06-10 22:55:38 +12:00
Trilbyspaceclone	0d7b769eee	Merge branch 'master' into meteor	2019-06-09 17:01:06 -04:00
Trilbyspaceclone	b073c29b19	Update all_nodes.dm	2019-06-08 16:17:49 -04:00
Fermi	f44b9048af	Added to vendors/tech.	2019-06-08 01:00:51 +01:00
Fermi	40aa231b64	Made MKUltra's OD on self turn the player into a narcissist.	2019-06-01 04:31:34 +01:00
Fermi	2eceb6f57b	Added a cybernetic tongue and sprites. Fixed furranium.	2019-06-01 01:28:52 +01:00
Fermi	a1afeb880f	Final testing. Added pH meter too. Compile safe.	2019-05-27 15:00:19 +01:00
CdrCross	82d308eb5e	Defibrillator Upgrades Proofread ... My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173) No stats or gameplay elements have been adjusted.	2019-05-21 23:37:28 +02:00
Sishen	c3df1b354e	Satchel of holding ... fashion creep	2019-05-09 20:44:07 -04:00
deathride58	9d6f85d555	Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47 ... adds message monitor to telecomms technode	2019-05-06 22:04:12 -04:00
kevinz000	cbc0607086	Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv ... Readds Laser carbines.	2019-04-30 05:31:33 -07:00
kevinz000	da11e400b9	Update all_nodes.dm	2019-04-26 03:18:45 -07:00
Trilbyspaceclone	c033210577	Update all_nodes.dm	2019-04-26 00:43:37 -04:00
Trilbyspaceclone	875bd522d0	grammer	2019-04-15 22:45:08 -04:00
Trilbyspaceclone	cc06df001a	Update all_nodes.dm	2019-04-14 23:20:09 -04:00
Trilbyspaceclone	94f97ba58d	Update all_nodes.dm	2019-04-06 15:15:55 -04:00
kevinz000	997e975e1d	Merge pull request #8170 from Trilbyspaceclone/Borgo ... Maybe adds adv health scanner to all borgs that have health scanners	2019-04-02 05:37:22 -07:00
kevinz000	ebdd1ecce5	Merge pull request #8173 from Trilbyspaceclone/2.0Defibs ... Defib upgrade tech	2019-04-02 05:35:04 -07:00
Seris02	c91fd98fb0	adds bluespace bio bags	2019-03-31 15:13:01 +08:00
Trilbyspaceclone	8bebae82f5	Update all_nodes.dm	2019-03-26 13:08:09 -04:00
Trilbyspaceclone	8752fd56da	Update all_nodes.dm	2019-03-25 16:39:47 -04:00
Trilbyspaceclone	b27ab885f3	[Ready] Adds new huds that help correct vision. (#7943) ... * Fixing updater * Adds the things * Update all_nodes.dm * Update misc_designs.dm * Update hud.dm * Update engine_goggles.dm * Update _glasses.dm * Update hud.dm * Update packs.dm * Update misc_designs.dm * Update packs.dm * Update hud.dm * Update all_nodes.dm * Update all_nodes.dm * Update hud.dm * Update misc_designs.dm	2019-02-05 18:09:34 -08:00
deathride58	9047538620	Merge pull request #7884 from Citadel-Station-13/kevinz000-patch-13 ... Readds drones	2019-01-14 21:36:37 -05:00
Trilbyspaceclone	7e8ba9a23c	[Ready] New adv surgery tools! (#7879) ... * Fixing updater * Update tools.dm * Update all_nodes.dm * Update medical_designs.dm * shit.jpg * Update medical_designs.dm * Update medical_designs.dm * Apply suggestions from code review Ragolutions' Grammar rework Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> * Apply suggestions from code review Reg being the best Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> * Huh	2019-01-08 02:36:43 -08:00
Trilbyspaceclone	a2ba37d664	Update all_nodes.dm (#7864)	2019-01-03 04:44:00 -08:00
Trilbyspaceclone	21f111b5e0	[Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873) ... * Fixing updater * Adds the gunthingy * makes the bullet * Update mecha_designs.dm * Update all_nodes.dm * Fixes stam harm	2019-01-03 04:38:10 -08:00