shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,660 Commits 5 Branches 0 Tags
8dd2dbef61ba0e44cceb51786d7c7bce6e6aef6f
Commit Graph

414 Commits

Author SHA1 Message Date
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
kevinz000
d5674d9692 Fix + Buff 2018-08-25 04:00:53 -07:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
Trilbyspaceclone
d871b33ecf Places Large grande into sci prolathen (#7487) 2018-08-23 00:27:48 -07:00
Cw 3040
0e1c78ca7b Adds temporary replacement for flightsuits (#7421) 
* update equipment_designs.dm

-adds Construction Hardsuit and Hardsuit Jetpack Upgrade to designs list

* update all_nodes.dm

-adds construction hardsuit and jetpack upgrade to tech node "EVA
Construction Equipment"
-requires advanced engineering and experimental tools, and 5000 tech
points

* update all_nodes.dm again

-i fucked up somehow
-forgot the display_name
 2018-08-17 20:14:18 -07:00
kevinz000
9547bed028 Update all_nodes.dm 2018-07-20 03:30:38 -07:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot
6b0e597553 [MIRROR] Fix circuit printer printing finished TEG machinery (#7294) 
* Merge pull request #38844 from AutomaticFrenzy/patch/circuits

Fix circuit printer printing finished TEG machinery

* Fix circuit printer printing finished TEG machinery
 2018-07-02 03:23:49 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656 
[MIRROR] Makes the deconstructable TEG working
 2018-07-01 09:36:57 -05:00
Dennok
58f634db63 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 05:41:53 -05:00
kevinz000
ef851d5744 Destructive analyzers can now destroy anything again, even if it has no materials (#38690) 
* Update rdconsole.dm

* Update destructive_analyzer.dm
 2018-06-26 15:42:16 -05:00
LetterJay
87cc0e6c6f Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360 
[MIRROR] Cleans up some logging
 2018-06-12 07:41:10 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
deathride58
a4345c8fdb Update stabilized.dm 2018-06-11 23:13:46 -04:00
deathride58
a2f1e9f47f Update _status_effects.dm 2018-06-11 23:13:11 -04:00
fludd12
c47c812fdf Fixes and Upgrades Stabilized Gold Extracts 2018-06-11 00:04:13 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58
b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
Dax Dupont
7dd53d445e Stock parts sorter now use get_parts_rating (#38191) 2018-06-01 04:15:02 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot
c2f9ff1358 [MIRROR] Anomaly Neutralizer (#6851) 
* Anomaly Neutralizer

* Update all_nodes.dm
 2018-05-27 17:20:37 -07:00
LetterJay
b6dabb1640 Merge pull request #6919 from Citadel-Station-13/upstream-merge-38095 
[MIRROR] [s] Blacklists TB grenade from experimentor.
 2018-05-27 14:42:32 -05:00
Dax Dupont
caf515f204 [s] Blacklists TB grenade from experimentor. (#38095) 2018-05-27 11:41:23 -05:00
ShizCalev
786b062f61 Capitalizes CentCom (#38086) 
* Capitalized CentCom

* neediful
 2018-05-27 11:40:12 -05:00
LetterJay
8c77b2d700 vr sleeper removal 2018-05-25 17:35:06 -05:00
LetterJay
6750abeb9e Merge pull request #6862 from Citadel-Station-13/upstream-merge-38020 
[MIRROR] Fix outdated R&D console comment
 2018-05-25 02:35:58 -05:00
CitadelStationBot
37f2768380 [MIRROR] Adds a missing + in techwebs point adjustment code (#6845) 
* Adds a missing + in techwebs point adjustment code

* Update _techweb.dm
 2018-05-24 20:55:23 -07:00
LetterJay
b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
Tad Hardesty
aec2e19b94 Fix outdated R&D console comment (#38020) 2018-05-23 16:12:04 -05:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
e7d9cd0698 Merge branch 'master' into upstream-merge-37597 2018-05-23 05:21:19 -05:00
LetterJay
647aa4f306 Update charged.dm 2018-05-22 12:30:43 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
488842a520 Update charged.dm 2018-05-22 08:01:29 -05:00