Commit Graph

55 Commits

Author SHA1 Message Date
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
Archie 12fde70d0c Cargo Changes Initial 2021-01-16 17:40:43 -03:00
Dahlular 46ffd229c9 whoops 2021-01-15 23:17:04 -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
Chemlight 403f4336db Lotsa bus implants and ATV supply n' demand
Since Krav maga has an implant to toggle it on and on, I thought lets add everything else! (Aside from boxing, that for example is just tied to boxing gloves).

Also ATV's are too easy to get, make it need effort to buy and become speed racer.
2021-01-15 04:25:16 -08:00
Archie 3d46b689ac Fix EOL issues 2021-01-14 14:54:39 -03:00
kevinz000 b5fe141a49 Supply Pod Code Update 2021-01-14 14:31:35 -03:00
Archie 78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000 5d80346f8f Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2021-01-05 16:54:23 -03:00
Archie 9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
Lin b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Ghom 291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
Chloe Carver-Brown c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
QuoteFox 7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +00:00
Oposshim ff4d63e8e0 a sort of recipe tweak addon 2020-12-09 13:10:46 -05:00
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Dahlular 238ab653c4 Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak
Kinaris Corp 1.1.9
2020-11-27 07:40:04 -07:00
Dahlular ea1a66fd8b Merge pull request #698 from ArchieBeepBoop/hev
HEV Suit Mk.I
2020-11-22 01:36:12 -07:00
Poss e27b3b7976 Update armory.dm 2020-11-21 22:39:07 -05:00
Poss 7c91ead418 Update armory.dm 2020-11-21 22:19:16 -05:00
Poss 4679cb537f Update armory.dm 2020-11-21 22:18:28 -05:00
Oposshim 7d6de4d969 Update armory.dm 2020-11-21 22:14:40 -05:00
Poss 88420d9de6 Delete armory.dm 2020-11-21 21:59:09 -05:00
Oposshim bb1694f301 Kinaris Corp 1.1.2
another long overdue haul of shit I forgot/was to busy to get the first patch around.
2020-11-21 12:05:56 -05:00
kevinz000 c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
Dip 762dd621ad HEV Suit Mk.I 2020-11-19 18:41:48 -03:00
Dip 6e989dfa51 fixes trash bag of holding bounty 2020-11-05 04:12:08 -03:00
Dip 65476a1b54 hypernob bounty 2020-11-05 03:56:37 -03:00
Ghom 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
kevinz000 82daa9b75e Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
2020-10-28 05:52:11 -03:00
kevinz000 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
kevinz000 4a9d6a82ce Merge pull request #9542 from Trilbyspaceclone/patch-231
Lowers Cargo most packs down to Pre- MK I Cargo rework*
2020-10-28 04:57:26 -03:00
kevinz000 2983dfa445 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
2020-10-28 04:39:39 -03:00
Dahlular 3be0cb650a Merge pull request #607 from ArchieBeepBoop/becomemodular
Oh boy, it's another one of Archie's mini packs. - Energy Harvester, HoS Pet Port and a micro carp buff.
2020-10-23 16:25:53 -06:00
Dip dc0a988d6c Energy Harvester V1 2020-10-23 05:55:58 -03:00
deathride58 cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Dip 73aed90893 HMMMM 2020-10-09 03:19:08 -03:00
Dip aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
Chemlight ee0f8ce2a0 Updating a cargo crate
Provided an extra item to the lewd crate contraband being a bottle of breast enlargment.
2020-09-24 06:12:50 -07:00
Unknown 3720725aff storge -> storage 2020-08-15 22:30:39 -05:00
Oposshim 23fca2d314 poss tweak
a new character creation background (Hirophant tiles)/ I forgot the sec cap Ns/ the NT MREs in maints/ I decided that the medical + is fuck ugly/ sneaked a system shock 2 reference in the toys with the rest of the SS13 sci fi stuff/ more NT i forgot with cargo bounties/ basically more surface level fixes
2020-07-28 19:24:45 -04:00
jjpark-kb d1e22462ad lots of radial stuff 2020-07-17 17:58:30 -04:00
JaySparrow 7e8ea19b69 Lewd bounties
Milk the crew. Get paid. This is the FUTURE.
2020-07-13 22:13:05 -05:00
CygnusB 137ed7f372 Rings
hell yeah rings
2020-07-03 19:59:19 -03:00
Dahlular a8407fc71e reeee 2020-06-12 00:43:38 -06:00
Oposshim 0880ceb0c7 Kinaris.Co Revamp2
more code changes to kin co instead of nanotrasen
2020-06-11 14:17:33 -04:00
CygnusB 34f71c489b It's 12 o'clock
Darn tootin' pardner
2020-01-31 19:03:44 -03:00