Commit Graph

229 Commits

Author SHA1 Message Date
Dahlular 6ed7131b25 Merge pull request #611 from Kabramen/polisuit-fix
Fix PR #584 and some additions for lockers and kink vendor
2020-10-23 21:21:25 -06:00
Kabra_men fd44d1a9fd Fix PR #584 and some additions for lockers and kink vendor 2020-10-23 23:19:34 -03:00
Dip 5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03:00
Dip 9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dahlular d0d9927b96 Merge pull request #599 from ArchieBeepBoop/becomemodular
SHITCODE: BECOME MODULAR
2020-10-18 13:23:38 -06: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
Dip 6e8f722c27 runtime go YEET 2020-10-18 03:57:44 -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
Dip fa20d21b96 SHITCODE: BECOME MODULAR 2020-10-16 18:41:40 -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
Archie e20b215597 code fuck up 2020-10-14 17:25:53 -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
Dip b513d3ba77 i am dumb 2020-10-07 23:56:44 -03:00
Dip 4bae4c2dbd TYPO 2020-10-07 20:07:23 -03:00
Dip c6e3bf8f60 Exile Patch + New Time Function 2020-10-07 17:38:25 -03: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
QuoteFox 631090cf04 Dynamic glidespeed
ported from yogstation
2020-10-05 03:58:10 +01:00
QuoteFox 5e298aac96 Merge pull request #549 from ArchieBeepBoop/moveforce
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-05 02:59:39 +01:00
Dahlular 345c735a2d Merge pull request #550 from ArchieBeepBoop/trees
Flora should not have this much integrity
2020-10-04 03:21:12 -06:00
Dahlular 278cfd549a Merge pull request #535 from ArchieBeepBoop/maptweaks
Map Tweaks + New Ghost Role
2020-10-04 03:10:17 -06:00
Dip d11b90e582 fuck trees 2020-10-04 04:33:49 -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 97060b267a Map Tweaks + New Duo Hermit Ghost Role 2020-09-29 05:08:01 -03:00
Dip 3cd86a33c6 Radiation Update Port 2020-09-28 22:18:29 -03:00
QuoteFox e03ea419b7 Merge pull request #523 from ArchieBeepBoop/randomness
We don't need no safety protocols - Merges Random Engines
2020-09-28 22:29:21 +01:00
Dip f659c2e67a caps 2020-09-28 01:14:08 -03:00
Dip 5ea7b7a4d6 IT LIVES 2020-09-27 15:32:40 -03:00
Putnam3145 c983e3662b a 2020-09-27 14:33:13 -03:00
QuoteFox 63128f684f Merge pull request #505 from ArchieBeepBoop/zlevel
Ports Citadel Multi-Z Level fixes
2020-09-26 23:11:47 +01:00
Unknown 75d965b783 a few capitalization fixes 2020-09-25 19:45:25 -05:00