shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,627 Commits 5 Branches 0 Tags
6db5655ceb8d272db8ddc8bdabb60e57d52cf749
Commit Graph

1885 Commits

Author SHA1 Message Date
Detective-Google
6db5655ceb Merge branch 'master' into 91-files-changed-fml 2020-05-02 17:16:18 -05:00
Ghommie
42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie
c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
Detective Google
7d4e4e24d6 Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work 2020-05-01 21:58:32 -05:00
kevinz000
ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697 
toylathe copypasta removal and preparations for economy public lathe nerf.
 2020-05-01 14:52:29 -07:00
Ghommie
54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
kevinz000
f99d904dc7 ports /tg/station vis_flags related fixes (#12064) 
* fixes

* Update layers_planes.dm

* kay
 2020-05-01 21:14:04 +02:00
kevinz000
269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
Detective Google
231fd0edea fixes the stupid fucking tile placing list 2020-04-30 23:04:35 -05:00
Detective-Google
c146c898c0 Merge branch 'master' into 91-files-changed-fml 2020-04-30 18:42:38 -05:00
Detective Google
f6736e862d it compiles, now to fix the maps 2020-04-30 15:49:06 -05:00
Lin
c4250a41d2 Merge pull request #12017 from kevinz000/skills 
Implements a basic skill system + adds surgery skill
 2020-04-30 17:39:21 +00:00
kevinz000
8dae739d8f fixes 2020-04-30 01:39:38 -07:00
kevinz000
615dc71069 fixes 2020-04-30 01:26:46 -07:00
kevinz000
bd7b1b1193 fixes 2020-04-30 01:23:21 -07:00
kevinz000
f028672e3c Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml 2020-04-30 01:00:08 -07:00
kevinz000
432724a388 fixes 2020-04-30 00:58:59 -07:00
kevinz000
1e42f3a3b7 Merge pull request #12023 from Ghommie/Ghommie-cit712 
Fixing riding layers for human/cyborgs.
 2020-04-29 12:03:29 -07:00
kevinz000
464fcd02cd Merge remote-tracking branch 'citadel/master' into skills 2020-04-25 22:18:08 -07:00
kevinz000
af08e0fecf Merge pull request #11984 from Hatterhat/fastpump 
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
 2020-04-25 17:07:29 -07:00
kevinz000
36512938a0 Merge pull request #11991 from DeltaFire15/nanite-repli-protocols 
Adds nanite replication protocols to our techweb
 2020-04-25 16:54:32 -07:00
kevinz000
a533906f73 Merge pull request #11992 from Ghommie/Ghommie-cit703 
reagents value nerf and standardization.
 2020-04-25 16:54:14 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000
7d688126c8 Merge pull request #12008 from Ghommie/Ghommie-cit707 
VR Levels are not a subset of Away Missions anymore.
 2020-04-25 16:51:52 -07:00
kevinz000
0bf1f1e34f Merge pull request #12010 from Ghommie/Ghommie-cit709 
Porting some VV updates from tg.
 2020-04-25 16:51:27 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Ghommie
d2d5fda0e2 Fixing riding layers for human/cyborgs. 2020-04-25 16:54:17 +02:00
kevinz000
ec4a40fa37 ok 2020-04-25 01:05:12 -07:00
kevinz000
6c5d42b5f5 oh boy 2020-04-25 00:48:56 -07:00
Ghommie
0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghom
5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness 
Cybernetic arm implant balance pass (namely: shields)
 2020-04-25 02:47:28 +02:00
Ghommie
e17c51a85d Porting some VV updates from tg. 2020-04-25 00:49:51 +02:00
Ghommie
58fc679cce WIP 2020-04-24 20:49:15 +02:00
Detective Google
71be8ed2fc ports all the tg junk for icemoon, not yet changed to make it all compile 2020-04-24 00:02:03 -05:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
0beb28d3bb reagents value nerf and standardization. 2020-04-23 19:52:22 +02:00
DeltaFire
1a6f5eb131 If it compiles it works 
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
 2020-04-23 15:15:26 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Hatterhat
c686ed193b a book about mashing Z and LMB 2020-04-22 17:55:11 -05:00
Lin
7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692 
Shielded Component
 2020-04-22 20:33:12 +00:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000
c551006295 catch dropped 2020-04-22 10:54:42 -07:00
Ghommie
e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghommie
1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
Ghom
79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu 
Fixes Crafting menu
 2020-04-21 01:25:46 +02:00
TrilbySpaceClone
4d55f169d5 oh god oh fuck 2020-04-20 17:05:03 -04:00
Timothy Teakettle
c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01:00
kevinz000
85fcdbf673 Merge pull request #11916 from Trilbyspaceclone/crafting_menu 
Cleans up misc tab in the crafting menu
 2020-04-20 11:37:13 -07:00
kevinz000
dc97b65681 Revert "Revert "Update mobs.dm"" 
This reverts commit d8d6ae8555.
 2020-04-20 04:03:13 -07:00