cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-03-06 19:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,695 Commits 12 Branches 0 Tags
ed5f2ba7144864df4d80e22db519a325665dc12c
Commit Graph

66 Commits

Author SHA1 Message Date
Chloe Carver-Brown
5e5b43212e fuck shit piss 2021-04-08 01:36:09 +01:00
QuoteFox
58b12a8147 Item sounds 2021-03-28 22:05:25 +01:00
QuoteFox
a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
 2021-03-27 10:56:34 +00:00
QuoteFox
a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +00:00
DragonTrance
3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance
24cb27b67c #5 2021-02-21 08:37:10 -07:00
Chloe Carver-Brown
c1c9b3bba2 Poggers 2021-02-15 23:47:04 +00:00
DragonTrance
58b69503e3 #4 2021-02-11 20:02:40 -07:00
DragonTrance
d09400af15 stop exploiting constructable showers 2021-02-10 07:23:31 -07:00
QuoteFox
4980b0556d Merge pull request #936 from ArchieBeepBoop/solar 
Modular Solar Panels + Solar Tracker Fix + Compile issue fix
 2021-01-29 20:38:48 +00:00
QuoteFox
3d1aabd694 Merge pull request #937 from quotefox/economy 
Hyper Economy part 1 - Money Movement.
 2021-01-29 01:18:58 +00:00
Archie
d50b781203 SolarTest11 2021-01-28 20:22:08 -03:00
Kabra_men
0b1a40baee that's a lot of stuff heck 2021-01-28 18:28:48 -03:00
Kabra_men
41c87b5e85 more wood stuff 2021-01-25 17:37:06 -03:00
QuoteFox
ecf93da4b1 Economy part 1 
Economy part 1
 2021-01-25 10:47:15 +00:00
Kabra_men
6c0a7b1b39 WOOD 2021-01-21 03:09:52 -03:00
Archie
ec28d0f66d Line ending conflict fix 2021-01-21 02:45:10 -03:00
nik707
858f994b5d Adds: The Chad Plasmaglass Table 2021-01-21 02:44:06 -03:00
QuoteFox
75eb4d5696 New chairs and recipes! 
New chairs and recipes!
 2021-01-21 01:20:12 +00:00
QuoteFox
f806ffd48b Merge pull request #891 from ArchieBeepBoop/cargo5 
Small cargo crate revamp + QoL changes
 2021-01-17 08:46:25 +00:00
kevinz000
7264218dca Alien Furniture 2021-01-16 22:57:45 -03:00
Archie
12fde70d0c Cargo Changes Initial 2021-01-16 17:40:43 -03:00
Chloe Carver-Brown
b49dc9536a Adds footwraps as a roundstart and craftable shoe 2021-01-16 02:49:23 +00:00
Lin
b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2021-01-05 01:34:16 -03:00
Archie
cab493231b Reagent fix pack 3 2021-01-01 02:21:45 -03:00
QuoteFox
9c2c2a22e2 Merge pull request #773 from DragonTrance/deconstructing 
Adds the Ability to deconstruct various objects
 2020-12-28 19:34:37 +00:00
DragonTrance
57117b0017 why does my compiler do this i hate it 2020-12-25 13:39:51 -07:00
Ghom
0c8ed89992 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-12-25 17:30:06 -03:00
DragonTrance
162ae674c6 constructible showers, loom, sinks & barrels now deconstruct 
Deconstruction:
Loom - Screwdriver
Wooden Barrel - Screwdriver
Sink - Wrench
Shower - Screwdriver > Wrench

Securing:
Loom - Wrench
Wooden Barrel - Wrench
Shower - Screwdriver

Adds showers as craftable objects when using metal sheets. Also organizes some things in the metal sheet crafting menu
 2020-12-25 13:22:21 -07:00
QuoteFox
7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain 
Ports reagents id removal and typepath usage
 2020-12-23 17:48:37 +00:00
Lin
a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Oposshim
6e66585d13 donk boxes list 2020-12-09 12:28:39 -05:00
CygnusB
ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
Ghom
28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dip
9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
kevinz000
45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2020-10-28 05:48:57 -03:00
kevinz000
2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259 
Porting GetComponent macros removal, and few other updates.
 2020-10-27 14:42:55 -03:00
Dip
c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2020-10-17 22:25:16 -03:00
KathrinBailey
fdafeb94d8 tile floofing 2020-10-10 06:36:58 +01:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000
b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
 2020-10-03 19:35:47 -03:00
Dip
f659c2e67a caps 2020-09-28 01:14:08 -03:00
Dip
72c8e681e3 runtimev1-experimental 2020-09-22 16:37:51 -03:00
Dip
7e090472a8 fix 2020-09-18 20:55:08 -03:00
Dip
11b6d44aa5 craftable solar bois 2020-09-18 20:54:48 -03:00
Dip
918a0c04bf Bugfixes, convert to machinery type. 2020-09-16 20:50:15 -03:00
Dip
36218b61b9 Powered Microfan Craft Rework 2020-09-16 19:09:36 -03:00
Dip
d0765fbbc1 Micro powered fans! 2020-09-14 23:13:55 -03:00
Dip
d3048c85a8 Craft Tiny Fans with metal sheets 2020-09-14 14:50:41 -03:00