Commit Graph
95 Commits
Author SHA1 Message Date
Toast 417401b2b7 Last commit before first test run 2019-12-03 20:27:33 -05:00
Toast 1adb79deaa Update cloning pod and atom for multitool 2019-12-03 20:08:52 -05:00
Toast 1aecaa24fd Crafting mind runes 2019-12-03 19:41:51 -05:00
Toast 94b33ed771 Revert "Revert "This is painful""
This reverts commit 95e35dc714.
2019-12-03 19:32:04 -05:00
quotefox 95e35dc714 Revert "This is painful"
This reverts commit 0da5609e9a.
2019-12-03 03:55:20 +00:00
quotefox b533ea8b9c Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-12-03 03:50:03 +00:00
quotefox 816ce5b8fe Fixes to cloning. Revert. 2019-12-03 03:48:56 +00:00
quotefoxandGitHub 8adc12fc22 Merge pull request #104 from SynnGraffkin/Ore-Silo-Mechfab
Modifies the Mechfab to use the Ore Silo
2019-12-02 20:24:36 +00:00
quotefoxandGitHub 4259bb76a1 Merge pull request #109 from Azarak/master
NEW CARGO CRATES + minor fixes/typo fixes to current ones
2019-11-30 20:16:11 +00:00
quotefoxandGitHub 17da27abe6 Merge pull request #108 from SynnGraffkin/Empty-Clones
[Port] Adds "Empty" Cloning, Logging, and related fixes
2019-11-30 20:15:56 +00:00
quotefoxandGitHub 22db566e21 Merge pull request #105 from SynnGraffkin/Fuck-Xenos
[Port] Adds MK I Ripley and conversion kit for MK II
2019-11-30 20:15:02 +00:00
quotefoxandGitHub cbb3776766 Merge pull request #99 from Kraseo/513compat
Adds 513 compatibility
2019-11-30 20:14:03 +00:00
Azarak dd4e7df65e New cargo crates, typo fixes, and some minor fixes 2019-11-29 19:26:38 +01:00
Toast 0da5609e9a This is painful 2019-11-29 01:14:04 -05:00
Toast 85cad6b4ac Fixing one of two fuckups 2019-11-27 20:14:37 -05:00
Toast a378b6239a Code stuff 2019-11-27 16:36:02 -05:00
Toast 6bb71fc5c0 Update mech_fabricator.dm 2019-11-27 02:31:53 -05:00
Seris02 2ca2a7d41e winter coats 2019-11-26 19:01:58 +08:00
Kraseo e0a9fecaaf i don't have a funny joke so have this commit log instead 2019-11-25 15:38:16 +01:00
quotefox 20d85b8d35 bones breaking system 2019-11-25 07:11:44 +00:00
quotefox c8169d289f perminant solution to the whitelist, whitelist/panic is now handled on the database. 2019-11-22 14:00:04 +00:00
quotefox 0e829e799e Whitelistfixing 2019-11-22 09:38:37 +00:00
Jessiekhat 184485c65c Cyborg Overhaul Booty+
Added dickgirl version of all bootyborgs and improved all of the sprites. Ported /tg/station's service, beaker, and circuit manipulator modules and upgrades for their respective borg types. Added rags, soap, crowbar, ect. to appropriate cyborg modules for quality of life improvment. Made similar changes to dog-borgs to bring them up to speed with the rest of the borg modules.
2019-11-20 23:49:51 -06:00
quotefox 002b595775 removed band 2019-11-19 04:38:44 +00:00
quotefoxandGitHub 933c8cf852 Merge pull request #87 from namjay1170/master
Durathread QOL
2019-11-19 03:53:45 +00:00
quotefoxandGitHub 96d50b6967 Merge pull request #81 from shellspeed1/more-ody-construction-fixes-
Fixes ody construction.
2019-11-19 03:50:37 +00:00
Nam e8f20dae0a Durathread fix
This ones for reals

Found out some fixes I did azy already did cause I didnt update my shit :(

Couldnt make bandoliers work in crafting menu so they got moved to stack crafting and added alt jumpsuit and jumpskirt for durathread
2019-11-18 05:19:53 -08:00
Code-CygnetandGitHub d9fe2e0e7e Updates plushes.dm
Adds new Marilyn plush. Updates plushes.dm from Cit mother branch as well.
2019-11-16 23:13:21 -05:00
shellspeed1 d9412b94d8 fixes the rogue step or 3 involved. 2019-11-16 00:43:37 -08:00
Azarak d0b00ce298 Ports taser changes 2019-11-15 18:43:07 +01:00
quotefoxandGitHub e807384f21 Merge pull request #66 from shellspeed1/hotfix-to-make-fix-ody-correction-
Hotfix to ody construction.
2019-11-12 00:26:50 +00:00
shellspeed1 ed8c1e6a46 Update mecha_construction_paths.dm 2019-11-10 14:06:52 -08:00
Toast 54250038a7 GASES 2019-11-10 02:06:20 -05:00
quotefox 739240592e - Fix to github 2019-11-08 21:50:59 +00:00
quotefox 23d7ac11af Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
# Conflicts:
#	icons/obj/device.dmi
2019-11-08 20:55:57 +00:00
quotefoxandGitHub 19810f7e98 Merge pull request #59 from Azarak/master
It's me trying to fix a conflict and I've never done this don't mind me
2019-11-08 20:48:47 +00:00
quotefox ace551ba39 bone stuff 2019-11-08 20:48:18 +00:00
Azarak 80db742296 Merge branch 'master' into pr/1 2019-11-08 21:11:46 +01:00
quotefoxandGitHub 1699ed1d94 Merge pull request #54 from SynnGraffkin/Construction-Bags
[PORT] Adds construction bags for engineers
2019-11-08 19:34:39 +00:00
quotefoxandGitHub db364363eb Merge pull request #57 from shellspeed1/bluespace-hotel
Ports Hilberts hotel (bluespace hotel)
2019-11-08 19:32:42 +00:00
Kabra_men a3c09948fa Cross 2019-11-07 18:06:34 -02:00
shellspeed1 0ab8a91ea9 Adds bluespace hotel 2019-11-06 18:15:11 -08:00
Azarak 1544eafb4f TG GENETICS AAAAAAAA
aaaaaaaa
2019-11-04 23:20:16 +01:00
Toast caa2d91eb4 Fixes 2019-11-04 03:09:52 -05:00
Toast 790881594d Bag-added 2019-11-04 02:34:49 -05:00
quotefoxandGitHub 1838075d99 Merge pull request #48 from shellspeed1/mech-capacitor-and-scanner-update
Ports some code improvements and gives odyessy, ripley, and firefighter scanners and capacitors.
2019-10-29 03:23:41 +00:00
quotefoxandGitHub 8ac316392d Merge pull request #49 from shellspeed1/removes-bags-from-toolbelts
removes storage bags from toolbelts
2019-10-29 03:22:35 +00:00
quotefoxandGitHub 8144df3a15 Merge pull request #50 from shellspeed1/stasis-bed-improvements
Borgs can now unbuckle people from stasis beds, Surgery is now performable on stasis beds.
2019-10-29 03:22:09 +00:00
shellspeed1 d2da9e571e borgs should be able to unbuckle people now. 2019-10-26 12:44:54 -07:00
shellspeed1 aa9fafcab9 removes storage bags from toolbelts 2019-10-26 12:01:03 -07:00