shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,701 Commits 5 Branches 0 Tags
674e8a42274a31a824976cd3143dfd99454e2a4e
Commit Graph

490 Commits

Author SHA1 Message Date
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118 
[Ready] Cleaner looking autolathen organization
 2019-05-25 11:51:17 -07: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
Trilbyspaceclone
3e4412e171 Delete autolathe_designs.dm 2019-05-12 02:04:07 -04:00
Trilbyspaceclone
62e5037eab Merge branch 'master' into patch-118 2019-05-12 02:03:32 -04:00
Trilbyspaceclone
db74544a7c Create autolathe_designs.dm 2019-05-12 02:02:49 -04:00
kevinz000
9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key 
Better Locked Collar checks
 2019-05-11 22:21:16 -07:00
kevinz000
9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding 
Satchel of Holding!
 2019-05-11 22:14:15 -07:00
Trilbyspaceclone
af7b7fc638 Update autolathe_designs_medical_and_dinnerware.dm 2019-05-10 16:48:52 -04:00
Trilbyspaceclone
2885330459 commit die 2019-05-10 16:30:39 -04:00
Trilbyspaceclone
a703b8b85f Yep this works 100% no errors at all! 2019-05-10 16:30:01 -04:00
Sishen
c3df1b354e Satchel of holding 
fashion creep
 2019-05-09 20:44:07 -04:00
kevinz000
a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer 
Makes a new COMBAT inducer! - Admin only
 2019-05-08 01:34:33 -07:00
Trilbyspaceclone
9adeccc5e1 Update autolathe_designs.dm 2019-05-06 23:47:39 -04:00
Trilbyspaceclone
ae75bf2fd1 Update autolathe_designs.dm 2019-05-06 23:46:31 -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
Trilbyspaceclone
9aa74f4fc2 Update all_nodes.dm 2019-05-06 19:58:45 -04:00
Trilbyspaceclone
5e5c470dc9 Update all_nodes.dm 2019-05-05 06:51:10 -04:00
Trilbyspaceclone
cc34a8fa4e Update all_nodes.dm 2019-05-05 06:47:03 -04:00
Trilbyspaceclone
5904d1d281 Update power_designs.dm 2019-05-05 06:45:40 -04:00
Trilbyspaceclone
29a4750e21 Update autolathe_designs.dm 2019-05-01 18:38:40 -04:00
Trilbyspaceclone
831e450b3f Update weapon_designs.dm 2019-05-01 16:08:17 -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
fdbaafa5a9 Update weapon_designs.dm 2019-04-26 00:45:17 -04:00
Trilbyspaceclone
c033210577 Update all_nodes.dm 2019-04-26 00:43:37 -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
726ace52eb merg conflict is this 2019-03-26 12:59:39 -04:00
Trilbyspaceclone
8752fd56da Update all_nodes.dm 2019-03-25 16:39:47 -04:00
Trilbyspaceclone
3feb70e1df Update mechfabricator_designs.dm 2019-03-25 16:38:10 -04:00
Amatsu Darkfyre
aedadb30a5 Fixes a difference between /tg/ and Citadel that made extracts uninjectable. 2019-03-10 23:54:45 -04:00
kevinz000
b17b2a0a4a Merge pull request #8097 from AmatsuDF/master 
Adds Chilling effects to Slime Crossbreeding
 2019-03-10 13:50:37 -07:00
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto 
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
 2019-03-10 13:44:57 -07:00
Amatsu Darkfyre
2d286e525d Changes Adamantine Suit's armor values to not be bad. 
Also recolors the Slime Mask so it's more obvious at a glance what it is.
 2019-03-10 15:10:07 -04:00
Trilbyspaceclone
5197c0fb94 Update weapon_designs.dm 2019-03-09 20:34:39 -05:00
Trilbyspaceclone
ce7c76e8a4 ? 2019-03-09 20:12:44 -05:00
Trilbyspaceclone
979f9125ef Update weapon_designs.dm 2019-03-09 19:54:48 -05:00
Amatsu Darkfyre
54a9b3206f Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm. 2019-03-08 17:22:40 -05:00
Amatsu Darkfyre
575c7ebeba Adds Chilling effects to Slime Crossbreeding, along with their icons and proper DM files. Nothing is modularized, as this is all content from upstream, so there should be no upstream conflicts when or if a sync occurs. 2019-03-08 04:02:21 -05:00
deathride58
41d3f7f7b7 Merge pull request #8026 from Citadel-Station-13/kevinz000-patch-28 
bandaid fix around timers and usr assignment
 2019-02-22 13:01:31 -05:00
deathride58
e6757bd39c nerfs the effects of slime speed potions on vehicles to result in movement on par with sprint speed (#8008) 2019-02-22 06:01:06 -08:00
kevinz000
a67be2a57a Update _production.dm 2019-02-20 05:33:29 -08: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
kevinz000
277b589f1f Update weapon_designs.dm 2019-01-04 03:44:47 -08:00
Trilbyspaceclone
a2ba37d664 Update all_nodes.dm (#7864) 2019-01-03 04:44:00 -08:00