Commit Graph

551 Commits

Author SHA1 Message Date
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
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
kevinz000
906922a3e3 Update all_nodes.dm 2019-01-03 04:30:24 -08:00
kevinz000
b041f3318c Update electronics_designs.dm 2019-01-03 04:29:36 -08:00
deathride58
6699d2fce6 Merge pull request #7718 from Citadel-Station-13/kevinz000-patch-13
adds proper facename/coordinates to R&D logs
2018-11-25 07:17:03 -05:00
kevinz000
8418eadc5b Update rdconsole.dm 2018-11-19 20:11:29 -08:00
kevinz000
074a582fed Update utility.dm 2018-11-19 20:09:06 -08:00
deathride58
500f068fe5 Merge pull request #7645 from Trilbyspaceclone/Tecweb_reblance
[Ready] Re-balance Tech Web nodes and points
2018-11-18 07:41:39 -05:00
deathride58
f385751c4a Brings back nonlethal 38 bullets in a semi-nerfed state, keeps the current lethal variant in as a brand new sec autolathe printable ammo box (#7723)
* Brings back nonlethal 38 bullets in a semi-nerfed state, adds lethal variant for the c38 bullet available at autolathes

* Im drunk ignore me
2018-11-16 14:46:54 -08:00
kevinz000
8eed799f08 Update rdconsole.dm 2018-11-12 14:42:41 -08:00
Trilbyspaceclone
202645ca10 Woops sorry! 2018-10-30 18:53:12 -04:00
deathride58
f896a921ba Merge pull request #7677 from Tupinambis/SHODAN
Makes all ion references to "humans" reference to "crew" instead.
2018-10-30 18:33:46 -04:00
deathride58
8341671fa1 Merge pull request #7682 from Trilbyspaceclone/Bloody_bags
Craft-able blood bags!
2018-10-30 18:33:25 -04:00
kevinz000
ad05591136 Update rdconsole.dm 2018-10-29 00:26:23 -07:00
Trilbyspaceclone
d4ab22be46 Fail-Coder 2018-10-28 21:23:24 -04:00
Trilbyspaceclone
e721fc3ea3 ^_^ 2018-10-28 21:05:26 -04:00
Trilbyspaceclone
4e4bfe7873 Merge branch 'master' into Bloody_bags 2018-10-28 20:51:53 -04:00
Trilbyspaceclone
ed8f552ba1 Renames 2018-10-28 20:39:52 -04:00
Trilbyspaceclone
b9f196991d Adds in the blood bag 2018-10-28 20:36:59 -04:00
Trilbyspaceclone
5f47e3015f Stuff and bloody things 2018-10-28 20:34:35 -04:00
Tupinambis
db74ad4361 Fixes 2018-10-27 23:39:09 -05:00
Tupinambis
2e0cb266de Makes all ion references to "humans" reference to "crew" instead. 2018-10-27 21:01:03 -05:00
Trilbyspaceclone
2194919129 Deal 2018-10-24 15:33:50 -04:00
Trilbyspaceclone
dc6dbe2715 Makes the lims get-able 2018-10-12 12:06:25 -04:00
Trilbyspaceclone
c2c77a643a add the lims to be made 2018-10-12 12:05:18 -04:00
Trilbyspaceclone
38846152ae Re-balance Mark II 2018-10-11 15:31:07 -04:00
Trilbyspaceclone
d97762e0e4 Re-balance Tech Web nodes and points (Feed back please) 2018-10-10 19:45:07 -04:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
99e57fb221 various citadel tweaks/fixes
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa
afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
997cb75f8f Merge pull request #7542 from Citadel-Station-13/kevinz000-patch-2
adds prescription nvgs
2018-09-10 18:51:05 -04:00
kevinz000
50c3a127f2 Update all_nodes.dm 2018-09-05 06:49:50 -07:00
kevinz000
dca6ea461b Update misc_designs.dm 2018-09-05 06:49:20 -07:00
Trilbyspaceclone
9a97c3ebd7 Makes a new blue space node! 2018-09-04 22:27:54 -04:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
deathride58
4446251a6d nerfs nerve support because lets face it, it's just straight-up cancer 2018-08-28 08:11:09 -04:00
kevinz000
cd13befadb Update _techweb_node.dm 2018-08-25 19:00:13 -07:00