shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,588 Commits 5 Branches 0 Tags
528a226daef09c0fa9c0e6a452e9f02a9a809fc2
Commit Graph

12843 Commits

Author SHA1 Message Date
Artur
528a226dae Done. 2020-02-24 13:36:55 +02:00
Artur
e08c89ce48 Reverts some 2020-02-21 15:10:39 +02:00
Artur
5d76d33683 Merge remote-tracking branch 'Upstream/master' into Solar_updates 2020-02-20 13:15:46 +02:00
Ghom
26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19 
Ports Broom, Tweak Janitor Vendor
 2020-02-20 11:48:06 +01:00
Ghom
d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites 
Ports TGUI Next and a lot of misc updates for nanites.
 2020-02-20 11:27:48 +01:00
Ghom
32c001f264 Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15 
buffs pai radio short 5 -> 3 minutes
 2020-02-20 11:26:17 +01:00
Ghom
89f256866d Merge pull request #11033 from kevinz000/cmo_drapes 
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
 2020-02-20 11:24:50 +01:00
Ghom
f94f997cc2 Merge pull request #11080 from kevinz000/surubatons 
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
 2020-02-20 11:09:46 +01:00
Ghom
7d8ae07fa0 Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12 
projectiles now pierce through pAIs no matter what
 2020-02-20 11:09:03 +01:00
Ghom
c1f8deb4a5 Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17 
removes pai fulltile opacity
 2020-02-20 11:08:27 +01:00
Ghom
e9d0f536de Merge pull request #11146 from Putnam3145/supermatter-hardcap 
Hardcaps supermatter damage from ballistics and similar
 2020-02-20 11:08:14 +01:00
Ghom
1f42e9f451 Merge pull request #11149 from Putnam3145/fix-vendor-badcode 
fixes mining vendors failing and eating your points iff you have exactly enough points
 2020-02-20 11:07:51 +01:00
Ghom
22a041f72b Merge pull request #11160 from Hatterhat/chem-combat-sucked-anyway 
a mouth cover check for pies
 2020-02-20 11:00:00 +01:00
kevinz000
6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows! 
Silk into clothing, bows, arrows, quivers and more!
 2020-02-19 19:05:49 -07:00
kevinz000
49279086b7 Merge pull request #11113 from CameronWoof/biogeneratin' 
Adds diethylamine and saltpetre to the biogenerator
 2020-02-19 19:03:35 -07:00
kevinz000
9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583 
Something more about runtime errors.
 2020-02-19 19:03:01 -07:00
Hatterhat
9929cecec5 wack 2020-02-19 20:01:40 -06:00
kevinz000
8567346501 Merge pull request #10953 from Ghommie/Ghommie-cit564 
The awesome adventures of the missing spurdo line replacement file.
 2020-02-19 19:00:53 -07:00
kevinz000
6df64da7d6 Merge pull request #11133 from Citadel-Station-13/Ghommie-patch-2 
Nerfs the fermenting barrel export industry & co.
 2020-02-19 19:00:02 -07:00
kevinz000
1c2dca4a00 Merge pull request #11132 from Ghommie/Ghommie-cit585 
Something about tesla revolvers and tk.
 2020-02-19 18:59:44 -07:00
kevinz000
b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586 
Something about pAIs and silicon access priviledges.
 2020-02-19 18:59:10 -07:00
Hatterhat
6b1a721f1c literally a mouth cover check 2020-02-19 17:51:18 -06:00
Arturlang
901b54b7e8 Webedit man to the doom and rescue 2020-02-20 01:38:28 +02:00
Arturlang
796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
Putnam
60f819465c what. what. what. what. what. 2020-02-18 18:30:15 -08:00
Ghom
479cdccd17 Merge pull request #11138 from Citadel-Station-13/kevinz000-patch-11 
The game's BUILT IN AUTOCLICKER no longer triggers the autoclicker detection system
 2020-02-19 02:12:42 +01:00
Ghom
0619521418 Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4 
Corrects a few cargo crates/exports (and nerfs some)
 2020-02-19 02:10:25 +01:00
Ghom
4d39bae16b Merge pull request #11103 from PersianXerxes/cargoTraitorObjectivesRDumb 
Clarifies comments and locks defusal kits behind an emag
 2020-02-19 02:09:02 +01:00
Ghom
77d5c09858 Merge pull request #11124 from Citadel-Station-13/kevinz000-patch-7 
Bandaids a projectile runtime, removes an unused variable
 2020-02-19 02:05:49 +01:00
Putnam
2834994587 why didn't we do this sooner 2020-02-18 11:34:09 -08:00
Ghom
08c86ec1ea Merge pull request #11091 from BlueWildrose/master 
Podpeople species tail wag fix; also lifebringer name fix
 2020-02-18 17:11:50 +01:00
Ghom
6ea2843149 Merge pull request #11131 from Seris02/demondabbing 
nerfs bloodcrawl to a cooldown of 0.6 seconds instead of no cooldown
 2020-02-18 17:02:17 +01:00
Ghommie
698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000
d04126226b Merge pull request #11082 from Hatterhat/preservahyde 
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
 2020-02-18 02:21:37 -07:00
kevinz000
9280e25703 Merge pull request #11087 from Ghommie/Ghommie-cit579 
Fix for solar panels/trackers being wonky.
 2020-02-18 02:21:16 -07:00
kevinz000
ed36aae74b Merge pull request #11112 from necromanceranne/mech-revival 
Mech Stuff: Ports /tg/ pr #44529, reverts #9092 (mostly)
 2020-02-18 02:18:57 -07:00
kevinz000
c1df5d5313 Merge pull request #11111 from Ghommie/Ghommie-cit582 
Virology support for synthetic blood and some blood subtypes removal.
 2020-02-18 02:18:03 -07:00
kevinz000
918618831c Merge pull request #11109 from Citadel-Station-13/Ghommie-patch-3 
Something about gibs and mob biotypes.
 2020-02-18 02:17:32 -07:00
kevinz000
84633e7fe4 Merge pull request #11104 from Trilbyspaceclone/patch-288 
Maybe makes Express console log their buying habits
 2020-02-18 02:13:53 -07:00
kevinz000
43b9875bbd Merge pull request #11119 from Ghommie/Ghommie-cit584 
Something about consistency and magnetic rifles.
 2020-02-18 02:12:51 -07:00
kevinz000
d6fe0df7ac Update pai.dm 2020-02-18 02:10:03 -07:00
kevinz000
9264163d93 Update pai.dm 2020-02-18 01:47:20 -07:00
kevinz000
6a97006b12 Update pai_defense.dm 2020-02-18 01:41:28 -07:00
kevinz000
9dbc6ca183 Update client_procs.dm 2020-02-17 22:37:58 -07:00
Winter Flare
ed46d3ca1c Typo 2020-02-18 00:37:28 -05:00
Winter Flare
1a994e7f1e Ports Broom, Tweak Janitor Vendor 
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120

Makes Broom printable.

Reduces Broom sound effect.

Updates Janitor Vendor to have equipment for at least 2 janitors.
 2020-02-17 23:36:22 -05:00
BlueWildrose
78fcd706b3 Requested changes, podpeople.dm 2020-02-17 19:41:30 -07:00
Cameron!
a9f103fb34 removes unused bottle, kicks travis? 2020-02-17 15:28:10 -08:00
Trilbyspaceclone
8f653b4dd6 Update materials.dm 2020-02-17 15:48:31 -05:00
Trilbyspaceclone
3b82e34db6 Update code/modules/cargo/packs/emergency.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-17 15:48:02 -05:00