DragonTrance
|
a297b6f05c
|
2
|
2020-11-22 14:14:50 -07:00 |
|
Dip
|
a76185269b
|
Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into syndicateleague2
|
2020-11-10 14:05:51 -03:00 |
|
Dahlular
|
cbdce23df4
|
Merge pull request #652 from ArchieBeepBoop/virofixes
[TESTMERGE] The Viro Rework done right? Ports a load of viro, (sentient) disease, symptoms code updates from tg.
|
2020-11-10 01:54:24 -07:00 |
|
kevinz000
|
a663b96d2f
|
Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Syndicate Major League Player
|
2020-11-09 18:33:18 -03:00 |
|
QuoteFox
|
48cdd74808
|
Ridding crop sprite.
made a ridding crop sprite. because it was using a chain before.
|
2020-11-09 15:27:51 +00:00 |
|
Dip
|
124a266e9a
|
stack size
|
2020-11-05 23:57:54 -03:00 |
|
kevinz000
|
752a3d9bcc
|
Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
|
2020-11-03 01:51:18 -03:00 |
|
Dip
|
c4680a7c28
|
the sequel
|
2020-11-02 15:01:08 -03:00 |
|
Dip
|
8916a47eac
|
let's fucking NOT
|
2020-11-02 06:26:01 -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
|
82daa9b75e
|
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
|
2020-10-28 05:52:11 -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
|
071f1cc6af
|
Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
Code stuffs + more framework for cargo rework cuz atomic prs are good
|
2020-10-28 04:52:13 -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
|
9b7eee0a89
|
merge conflict
|
2020-10-18 16:54:22 -03:00 |
|
Dahlular
|
7e05bf7e62
|
Merge pull request #591 from ArchieBeepBoop/durabelt2
Turns the Durathread Belt into a general belt for all main professions in terms of allowed items
|
2020-10-18 13:18:34 -06:00 |
|
Dip
|
6163b7c963
|
GRUG SMASH RUNTIME
|
2020-10-18 04:34:21 -03:00 |
|
kevinz000
|
2e75188a0b
|
Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
|
2020-10-18 00:03:22 -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 |
|
QuoteFox
|
1c151faf05
|
Merge pull request #590 from ArchieBeepBoop/radiationfixes
Radiation runtime fix, collector balance tweak, Machinery Alt Click, jukeboxes finally work, turrets no longer target megafauna, etc
|
2020-10-16 12:32:49 +01:00 |
|
kevinz000
|
6378761217
|
Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
|
2020-10-15 18:16:14 -03:00 |
|
Ghom
|
d689ed02f5
|
Merge pull request #10781 from r4d6/RPD
RPD icon reorder, less building pixelhunting
|
2020-10-14 02:41:52 -03:00 |
|
kevinz000
|
f6c62c57ba
|
Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
|
2020-10-14 02:34:25 -03:00 |
|
Archie
|
3f90f38f64
|
Belt
|
2020-10-14 00:58:56 -03:00 |
|
kevinz000
|
533a39d199
|
Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
|
2020-10-12 21:01:54 -03:00 |
|
QuoteFox
|
4b28162d04
|
Merge pull request #582 from ArchieBeepBoop/newthings
More Atmos - Relief Valves & Passive Vents
|
2020-10-12 15:34:40 +01:00 |
|
Ghom
|
473d2944d3
|
Merge pull request #10568 from r4d6/Passive-Vents
Add passive vents
|
2020-10-11 19:07:29 -03:00 |
|
Ghom
|
3d7ab5c63d
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-10-11 19:06:36 -03:00 |
|
Cydia
|
121919db3a
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-11 01:58:21 -05:00 |
|
Cydia
|
297f2f804d
|
new lipstick wip
|
2020-10-11 00:52:41 -05:00 |
|
Dahlular
|
78f702f74e
|
Merge pull request #578 from ToonClyde/Mmmm-yes-Carbon-Nanotubes
tasty carbon nanotube noodles
|
2020-10-10 23:28:33 -06:00 |
|
ToonClyde
|
19de1094e0
|
tasty carbon nanotube noodles
|
2020-10-10 18:07:51 -07:00 |
|
KathrinBailey
|
fdafeb94d8
|
tile floofing
|
2020-10-10 06:36:58 +01:00 |
|
Dahlular
|
107d47a1e8
|
Merge pull request #560 from ArchieBeepBoop/examinerefactor
Examine Code Refactor
|
2020-10-06 21:02:05 -06:00 |
|
Dip
|
aa7d47a23b
|
Examine Code Refactor
|
2020-10-06 23:36:21 -03:00 |
|
Dip
|
d5602e1948
|
Exiles
|
2020-10-06 15:46:02 -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 |
|
Lin
|
ac25b449f7
|
Merge pull request #9856 from Ghommie/Ghommie-cit367
|
2020-10-02 00:49:56 -03:00 |
|
Ghom
|
b433eab324
|
Merge pull request #10350 from Putnam3145
|
2020-10-01 23:04:52 -03:00 |
|
TotallyNotADog
|
32a2945069
|
better objective wording
|
2020-09-29 16:54:15 -05:00 |
|
Dip
|
3cd86a33c6
|
Radiation Update Port
|
2020-09-28 22:18:29 -03:00 |
|
Dip
|
f659c2e67a
|
caps
|
2020-09-28 01:14:08 -03:00 |
|
Unknown
|
75d965b783
|
a few capitalization fixes
|
2020-09-25 19:45:25 -05:00 |
|
Unknown
|
fe31a62d91
|
fixes kenk plush typos
|
2020-09-25 19:12:21 -05:00 |
|
Dip
|
72c8e681e3
|
runtimev1-experimental
|
2020-09-22 16:37:51 -03:00 |
|
Dahlular
|
09fc201ba6
|
Merge pull request #473 from ArchieBeepBoop/solar
Craftable Solar Assemblies
|
2020-09-19 09:17:18 -06: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 |
|