Commit Graph

1208 Commits

Author SHA1 Message Date
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
QuoteFox eabffc2ee5 Merge pull request #895 from ArchieBeepBoop/pandemic
Something about the Pandemic's UI Crashing
2021-01-17 08:45:16 +00:00
QuoteFox 76fca5514f alien honey for breasts, and fixes the breast liquid.
alien honey for breasts, and fixes the breast liquid.
2021-01-17 02:13:18 +00:00
Archie 4ee3ea16e0 Fixes Pandemic UI Crash 2021-01-16 22:47:29 -03:00
Archie 887c32e0bd Lipolicide overdose is too strong. 2021-01-16 22:36:21 -03:00
Archie d3b8b1d1aa Fixes 2021-01-16 22:15:05 -03:00
Archie 50822ed9b9 Synthetics can now speak slime 2021-01-16 18:44:43 -03:00
Archie 12fde70d0c Cargo Changes Initial 2021-01-16 17:40:43 -03:00
Archie 41540397db Fixes a bunch of fallout 2021-01-16 16:12:38 -03:00
Archie 098b0fc326 logv1 2021-01-16 14:39:54 -03:00
Dahlular 46ffd229c9 whoops 2021-01-15 23:17:04 -07:00
Dahlular 92054e8f0e Merge pull request #887 from Dahlular/cargoupdates
New Cargo Crates, Moves Some Around
2021-01-15 22:49:59 -07:00
Dahlular bb892c90e4 New Cargo Crates, Moves Some Around
Diminicillin + Prospacillin cargo crates, and moves some other crates around. Removes an offensive comment.
2021-01-15 22:38:24 -07:00
Archie 76ebc0f494 New sprite! 2021-01-16 01:11:46 -03:00
Archie 42c738879a comment 2021-01-16 01:04:42 -03:00
Archie 5680049195 nerf the rat ™️ 2021-01-16 00:58:43 -03:00
QuoteFox 0d23ec3ee7 Merge pull request #881 from ArchieBeepBoop/ratswearetherats
SS13 - The Rat Update (Store mice in Chef hats + Regal Rats)
2021-01-16 03:48:26 +00:00
Chloe Carver-Brown 31379b786f Time to rrrumble 2021-01-16 03:14:07 +00:00
QuoteFox 83ae129c1b Merge pull request #883 from lyricalpaws/master
Footwrap shoes
2021-01-16 02:53:22 +00:00
Chloe Carver-Brown b49dc9536a Adds footwraps as a roundstart and craftable shoe 2021-01-16 02:49:23 +00:00
QuoteFox 8fed311d04 Merge pull request #882 from ArchieBeepBoop/bloodfix
Bullets no longer do equal blood volume deletion to unmitigated damage
2021-01-16 02:39:27 +00:00