Commit Graph

1228 Commits

Author SHA1 Message Date
DragonTrance e00a0700b1 #3 2021-02-10 15:35:26 -07:00
DragonTrance ed135323dc #2 2021-02-10 07:18:26 -07:00
DragonTrance 187471f0af #1 2021-02-08 19:15:44 -07:00
QuoteFox 07f7467daf Revert "Revert "Testing art skills""
This reverts commit 57146db436.
2021-01-26 17:58:39 +00:00
QuoteFox 57146db436 Revert "Testing art skills"
This reverts commit 52f76bd74a.
2021-01-26 17:55:04 +00:00
QuoteFox e26ed22d40 Merge pull request #927 from Chemlight/Dumb-doged-sprites
Testing art skills / more personal stuff
2021-01-26 15:37:37 +00:00
Chemlight 52f76bd74a Testing art skills
I ended up practicing some spriting with  byond's editing software, I'll have to find better methods about how to do this (like uploading a png from SAI) Regargless I liked how these all came out it was too good that not putting them in would be a waste.
2021-01-26 07:21:30 -08:00
QuoteFox 667aa686c1 Merge pull request #922 from Kabramen/walls
Walls and poker tables for the new wood types
2021-01-26 11:54:40 +00:00
Kabra_men 41c87b5e85 more wood stuff 2021-01-25 17:37:06 -03:00
QuoteFox d1f8f37c32 Bellies + Genitals hide fix
Can now how have bellies
2021-01-25 18:34:52 +00:00
QuoteFox a7cf51f6cd Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-23 10:50:23 +00:00
QuoteFox 319a4599c6 some fixes to her voice, removed ATENTHEN 2021-01-23 10:50:21 +00:00
Kabra_men d71a599224 cargo stuff 2021-01-22 21:42:38 -03:00
Kabra_men 3e6fb7b5e8 TREES 2021-01-22 20:45:16 -03:00
Archie 296b08c666 nein 2021-01-21 03:33:32 -03:00
Archie f2b22cd84e Removes hat knocking off, maintains hat landing 2021-01-21 03:27:27 -03:00
Archie bc90159799 Fix hardsuits 2021-01-21 03:09:42 -03:00
Archie f22a21f8cb Revert "Merge pull request #910 from quotefox/revert-905-AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER"
This reverts commit 3c0c4c41a1, reversing
changes made to e79656c1ba.
2021-01-21 03:07:29 -03:00
Archie 98f796d874 Merge remote-tracking branch 'upstream/master' into bread 2021-01-20 14:06:59 -03:00
Archie cd8ef5be4b fixes bread & banana spider loot 2021-01-20 14:05:20 -03:00
Dahlular 893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00
QuoteFox e79656c1ba Merge pull request #905 from MalricB/AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER
ports hat throwing
2021-01-20 13:04:18 +00:00
QuoteFox 0150066d67 Merge pull request #906 from ArchieBeepBoop/sleepers
Removes VR sleepers from pubby + disables crafting VR sleeper boards.
2021-01-19 23:40:26 +00:00
QuoteFox 6a9f162a5d Merge pull request #907 from MalricB/give-me-death-or-give-me-nothing
Owing to his laconic character and lack of conversational input, the stranger was reluctant to engage in social intercourse with the vast majority of the townspeople he encountered on his travels. None of the aforementioned desert-dwelling individuals felt that their motivations were sufficiently compelling to make inquiries regarding the purpose of the stranger’s visit, causing the townspeople to take precautionary measures in order to avoid making even the most innocuous allusions to the mysterious and intimidating visitor. This unquantifiable foreigner, gathered in the company of said petrified townspeople, was in possession of a piece of metal of considerable size, weight, and mass attached to the right side of his pelvis by means of a leather aperture designed to extend the wearer's carrying capacity.
2021-01-19 23:40:12 +00:00
QuoteFox 5c09c6df37 Merge pull request #903 from MalricB/punishesarchie
Entering upon horseback into the desert community known as "Agua Fria" located in the southwestern U.S. state known as New Mexico, a territory formerly under the jurisdiction of Spanish colonizers in 1598, was a man whose name, origin, motivations, and goals were unknown to every member of said desert community, on a particular day classified as "fine," indicating favorable weather conditions.
2021-01-19 23:39:54 +00:00
QuoteFox 2134e24a97 Merge pull request #902 from ArchieBeepBoop/bread
I have done nothing but teleport bread for three days
2021-01-19 23:39:26 +00:00
CygnusB 00abae18ae one more time
ye
2021-01-19 18:54:17 -03:00
Archie 25a467633b Removes VR sleepers from pubby + disables crafting VR sleeper boards. 2021-01-19 18:31:25 -03:00
CygnusB edf030d4b7 YEEHAWPARTDNERSYES
YEAAHHFDG
2021-01-19 18:28:13 -03:00
Archie ec3a68dc7a Runtime man bad 2021-01-19 18:09:23 -03:00
CygnusB 9ba7d398f6 Revert "Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie""
This reverts commit 8cda8bbd16.
2021-01-19 17:48:12 -03:00
CygnusB 17d7425417 MWS Microbatteries into techweb / sec techfab 2021-01-19 17:46:34 -03:00
Archie 35430cda6d runtime 2021-01-19 13:54:32 -03:00
silicons e1ad9f8957 i have done nothing but teleport bread for three days 2021-01-19 13:48:33 -03:00
CygnusB 8cda8bbd16 Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie"
This reverts commit 1945c166b4, reversing
changes made to c8d20ea83c.
2021-01-19 06:40:28 -03:00
CygnusB 8ece699ed9 Merge branch 'master' into punishesarchie 2021-01-19 06:30:10 -03:00
CygnusB f6c3dccaf9 Revert "Update human.dm"
This reverts commit 713aa33fa8.
2021-01-19 06:27:15 -03:00
CygnusB 958b01f4d0 part 2
forgot a bunch of shit, also had to re-do parts because we don't have update_overlays()
2021-01-19 06:09:55 -03:00
CygnusB f21db73775 fuck yeah
banana
2021-01-19 03:31:33 -03:00
Dahlular 9f0b22fa95 Code Cleanup + Cushions 2021-01-18 01:14:58 -07:00
QuoteFox 659550ff25 Fixed honey balls lable.
Fixed honey balls lable.
2021-01-17 11:59:34 +00:00
QuoteFox a7f3a8dca3 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-17 11:27:04 +00:00
QuoteFox f1a9db058a circuits exploit fix.
circuits exploit fix.
2021-01-17 11:26:54 +00:00
Dahlular b8996b962d Merge pull request #898 from Dahlular/ikeacargo
REEEEEEEEEEEEEEEEEE
2021-01-17 04:24:26 -07:00
Dahlular 4c02fcc06f REEEEEEEEEEEEEEEEEE 2021-01-17 04:22:20 -07:00
Dahlular 0fa8bff364 Merge pull request #897 from Dahlular/ikeacargo
Carpentry Part 1
2021-01-17 04:17:39 -07:00
Dahlular 30cfdc1f22 makes it fucking buyable 2021-01-17 04:12:13 -07:00
QuoteFox f806ffd48b Merge pull request #891 from ArchieBeepBoop/cargo5
Small cargo crate revamp + QoL changes
2021-01-17 08:46:25 +00:00
QuoteFox 60889e985c Merge pull request #894 from ArchieBeepBoop/lipo
Nerfing Lipolicide Overdose
2021-01-17 08:46:03 +00:00
QuoteFox 978862f3a6 Merge pull request #893 from ArchieBeepBoop/nerfrat
Boomrat explosion logging
2021-01-17 08:45:38 +00:00