shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,276 Commits 5 Branches 0 Tags
aa605ec00791095f8fa56f8e86a95ec0a21923bc
Commit Graph

617 Commits

Author SHA1 Message Date
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
CameronWoof
df7a1f2b8d adds spaceman's trumpet seeds to the exotic seeds crate 2020-07-24 23:08:36 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00
Timothy Teakettle
1b99cb9201 everything has the bonesetter 2020-07-19 18:32:44 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
silicons
00867c064c Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals 
Drinkable and Sell-able Telecrystals
 2020-07-11 00:49:15 -07:00
silicons
36ba62652b Merge pull request #12717 from YakumoChen/wedding-crate 
Wedding crate
 2020-07-11 00:44:50 -07:00
YakumoChen
475a546033 adds wedding crate 2020-07-10 04:06:55 +00:00
YakumoChen
bfa672b091 adds some rings to the wedding crate 2020-07-09 07:49:11 +00:00
YakumoChen
1a82955f32 adds a wedding crate 2020-07-09 07:22:33 +00:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
HeroWithYay
bed6f4ac91 Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender. 
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
 2020-07-09 16:32:14 +12:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Timothy Teakettle
34c9a2f821 part 4 2020-06-11 21:45:32 +01:00
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
b1tt3r1n0
764ba26ace Pouches (#12432) 
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
 2020-06-09 03:22:39 -07:00
Artur
b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
Ghom
881dfe81c5 Merge pull request #12187 from Trilbyspaceclone/patch-373 
Nerfs cargo gas selling - MK different pr then the one that addresses this
 2020-06-08 08:21:07 +02:00
Ghommie
afff7472d6 ok 2020-06-08 07:39:48 +02:00
Trilbyspaceclone
6cf4985360 Update large_objects.dm 2020-06-08 01:09:27 -04:00
Trilbyspaceclone
abaf633ab9 Update large_objects.dm 2020-06-08 01:09:06 -04:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Trilbyspaceclone
d1a80ca2d7 Ghommie requested change 2020-06-03 20:29:17 -04:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Detective Google
d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom
ed90c59d65 Removal of """silk""" (#12221) 
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
 2020-05-19 23:43:46 -07:00
Lin
fc77954be3 Merge pull request #12290 from Ghommie/Ghommie-cit767 
Certain cargo packs (mostly armory/security) can not be privately purchased anymore.
 2020-05-19 05:15:12 +00:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268) 
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
 2020-05-18 04:46:57 -07:00
Ghommie
58432dd6be Thanks Trilby. 2020-05-18 03:21:02 +02:00
Ghommie
2eb3089ccb Certain packs (mostly armory/security) can not be privately bought anymore. 2020-05-17 23:38:26 +02:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Trilbyspaceclone
2e1cc498a3 corrects WT-550 ammo to state 32 rather then 20 (#12275) 2020-05-17 01:05:24 +02:00
Trilbyspaceclone
c6c4d61ee3 Cargo Rework - MK *why did I ever lison to people that were just powergamers?* (#11975) 
* Baby wheels off

* Oh god factorio is dead!

* Gas-p the nerfs!

* Update gear.dm

* tools

* Update large_objects.dm
 2020-05-15 03:57:28 +02:00
Trilbyspaceclone
899c5a4575 Corrects evey storge with storage (#12220) 
* Update medical.dm

* Update autobottler.dm

* Update autobotter_designs.dm

* Update medical_designs.dm

* Update hardsuit.dm

* Update code/modules/cargo/bounties/medical.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-13 21:21:11 +02:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00