Commit Graph
2693 Commits
Author SHA1 Message Date
CygnusB 00abae18ae one more time
ye
2021-01-19 18:54:17 -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
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
QuoteFox 6b36293b1e alien honey no longer puts you into a coma.
FUCK.
2021-01-17 08:36:13 +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
kevinz000andArchie 7264218dca Alien Furniture 2021-01-16 22:57:45 -03: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
QuoteFoxandGitHub 63262e68e5 Merge pull request #892 from CapnMachaddish/pubby-prisoner-console
[BINARIC RAGE]
2021-01-16 21:47:36 +00:00
Archie 50822ed9b9 Synthetics can now speak slime 2021-01-16 18:44:43 -03:00
Archie 3fa4bf8007 Allows borgs and drones to interact with tank dispensers 2021-01-16 18:38:45 -03:00
CapnMachaddish 713515db0f [BINARIC RAGE]
Fixes the prisoner consoles AGAIN
2021-01-16 15:35:58 -06:00
Archie 12fde70d0c Cargo Changes Initial 2021-01-16 17:40:43 -03:00
QuoteFoxandGitHub 01adee44c0 Merge pull request #866 from iloveyoulots/vendorhelp
Increase amount of fetish items in kinkmate and makes fake handcuffs properly appear.
2021-01-16 20:39:16 +00:00
QuoteFoxandGitHub a8aa419646 Merge pull request #890 from ArchieBeepBoop/idontwanttosettheworldonfire
Fixes some issues from the techweb refactor and reagent refactor
2021-01-16 20:39:04 +00:00
QuoteFoxandGitHub 5ba9b260a5 Merge pull request #889 from Chemlight/Dumb-doged-sprites
Doged
2021-01-16 20:38:45 +00: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 0ef4e2465d Basic Crafting Recipes and Items 2021-01-16 08:57:25 -07:00
Chemlight 66ae302494 Doged
This is a self insert
2021-01-16 05:58:25 -08:00
DahlularandGitHub 058d395bd3 Merge pull request #888 from Dahlular/fuckywucky
whoops
2021-01-15 23:18:16 -07:00
Dahlular 46ffd229c9 whoops 2021-01-15 23:17:04 -07:00
DahlularandGitHub 92054e8f0e Merge pull request #887 from Dahlular/cargoupdates
New Cargo Crates, Moves Some Around
2021-01-15 22:49:59 -07:00