Commit Graph
2714 Commits
Author SHA1 Message Date
QuoteFox 75eb4d5696 New chairs and recipes!
New chairs and recipes!
2021-01-21 01:20:12 +00:00
QuoteFoxandGitHub e79656c1ba Merge pull request #905 from MalricB/AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER
ports hat throwing
2021-01-20 13:04:18 +00:00
QuoteFoxandGitHub dac340c3b1 Merge pull request #908 from Dahlular/blaaaaaaades
Not-A-Mantis-Blade
2021-01-20 13:04:11 +00:00
Dahlular 42540fe114 arm scytheblades 2021-01-20 06:00:00 -07:00
QuoteFoxandGitHub 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
QuoteFoxandGitHub 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
QuoteFoxandGitHub 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
QuoteFoxandGitHub 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
QuoteFoxandGitHub dec90b5be4 Merge pull request #904 from ArchieBeepBoop/runtimemanbad2
Fixes 13 runtimes and 1 code issue
2021-01-19 23:38:55 +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 ab4b36ba56 Update miscellaneous.dm 2021-01-19 17:51:59 -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 88bd58d36b Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie 2021-01-19 17:46:42 -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
siliconsandArchie e1ad9f8957 i have done nothing but teleport bread for three days 2021-01-19 13:48:33 -03:00
QuoteFoxandGitHub daba9f53cb Merge pull request #901 from MalricB/punishesarchie
Martinsonis Macrobinsonski - Excessive amount of Fe, known commonly as 'iron', of considerable size, weight, and mass attached to the sternum of a human male specimen, by means of a leather aperture designed to extend the wearer's carrying capacity.
2021-01-19 10:25:58 +00:00
CygnusBandGitHub 520e075e39 Update secure.dm 2021-01-19 06:42:01 -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 1945c166b4 Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie 2021-01-19 06:39:56 -03:00
CygnusB c8d20ea83c multiphase briefcase now actually works
whoops
2021-01-19 06:39:32 -03:00
CygnusBandGitHub 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
DahlularandGitHub edcd90162f Merge pull request #900 from Dahlular/domehepot
Carpentry Code Cleanup + Cushions
2021-01-18 01:25:09 -07:00
Dahlular 9f0b22fa95 Code Cleanup + Cushions 2021-01-18 01:14:58 -07:00
QuoteFox a059fad980 lumberjack clothes and suits fix 2021-01-18 06:04:36 +00:00
DahlularandGitHub 8f656f91bd Merge pull request #899 from ArchieBeepBoop/kinarisstation1
Kinaris Logo to TGUI-NEXT interfaces
2021-01-17 20:30:34 -07:00
Archie 0f25b42e12 Kinaris Logo to TGUI-NEXT interfaces 2021-01-17 19:07:02 -03:00
QuoteFox 659550ff25 Fixed honey balls lable.
Fixed honey balls lable.
2021-01-17 11:59:34 +00:00
QuoteFox 09b109c00b lighter sound effects
as a smoker, I know the sound of the lighter is very important. (also removed Some WOW cool text)
2021-01-17 11:49:12 +00:00
QuoteFox 238be29c48 im sick of it, your sick of it. ITS GONE
im sick of it, your sick of it. ITS GONE
2021-01-17 11:29:46 +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
DahlularandGitHub 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
DahlularandGitHub 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
Dahlular c0726da8ff Stool framework 2021-01-17 04:06:31 -07:00
QuoteFox 5a0f707e23 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-17 09:40:42 +00:00
QuoteFox 2165bae2fa ORM sprite update
ORM sprite update, good bye mspaint drawing.
2021-01-17 09:40:39 +00:00
QuoteFoxandGitHub f806ffd48b Merge pull request #891 from ArchieBeepBoop/cargo5
Small cargo crate revamp + QoL changes
2021-01-17 08:46:25 +00:00
QuoteFoxandGitHub 60889e985c Merge pull request #894 from ArchieBeepBoop/lipo
Nerfing Lipolicide Overdose
2021-01-17 08:46:03 +00:00
QuoteFoxandGitHub 978862f3a6 Merge pull request #893 from ArchieBeepBoop/nerfrat
Boomrat explosion logging
2021-01-17 08:45:38 +00:00
QuoteFoxandGitHub eabffc2ee5 Merge pull request #895 from ArchieBeepBoop/pandemic
Something about the Pandemic's UI Crashing
2021-01-17 08:45:16 +00:00
QuoteFoxandGitHub 7634defce6 Merge pull request #896 from ArchieBeepBoop/alien
Alien Furniture
2021-01-17 08:44:59 +00:00