Commit Graph

554 Commits

Author SHA1 Message Date
silicons 9fc169a3ae Merge pull request #13432 from SiliconMain/patch-6
Tweaks a thing
2020-09-27 00:33:14 -07:00
SiliconMain 4e5296438c Update tool_designs.dm 2020-09-25 09:46:11 -05:00
Neko Boi Nick 6c8988c89c Light replacer can print at Engineering 2020-09-22 10:42:56 -07:00
raspy-on-osu 9b56991f77 init 2020-09-02 17:54:35 -04:00
silicons 9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
2020-08-29 21:34:57 -07:00
Chiirno fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
Letter N b8d812fb47 "what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50 2020-08-23 17:18:32 +08:00
lolman360 f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
lolman360 8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
lolman360 32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00
lolman360 f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10:00
lolman360 6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360 fee304fb19 Update medical_designs.dm 2020-08-09 22:55:10 +10:00
lolman360 308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Timothy Teakettle 9a9993c7be yep 2020-07-29 19:00:06 +01:00
SiliconMain 63bb9fe0f3 the dangers of copypaste 2020-07-26 16:35:50 -05:00
SiliconMain abdafe15fa fuck 2020-07-26 15:21:24 -05:00
lolman360 17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
lolman360 c07e5d544b wweeee 2020-07-22 11:27:26 +10:00
lolman360 0f1aa3c0ca 'lolman? did you test your code?'
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
timothyteakettle 7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons 6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
Timothy Teakettle 15e137dd18 Merge branch 'master' into tray-and-jar 2020-07-01 22:06:17 +01:00
kappa-sama cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama 1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
YakumoChen 8e25b90d54 removes obselete part 2020-07-01 09:08:01 +00:00
YakumoChen 327a36f8bd removes obselete autolathe designs 2020-07-01 09:06:29 +00:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
timothyteakettle 2e4c5e322d tray and jar 2020-06-29 02:49:31 +01:00
kappa-sama d98175d947 decal painter to lathe 2020-06-27 18:19:49 -04:00
kappa-sama 579727d41d spraycans 2020-06-27 18:14:20 -04:00
kappa-sama a96bd52c91 airlock painting 2020-06-27 18:13:09 -04:00
silicons 45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
silicons 3cad6221ca Merge pull request #12571 from Detective-Google/medigygax
Adds the medical-spec gygax
2020-06-24 08:43:30 -07:00
Detective-Google 29ab16c3ed Update mechfabricator_designs.dm 2020-06-22 18:27:58 -05:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
silicons 99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
shellspeed1 06f0d42ee9 makes chem packs slightly cheaper 2020-06-20 16:53:39 -07:00
Detective Google ab05e48149 adds the medical gygax 2020-06-20 16:22:28 -05:00
Ghommie 43acf79dd3 oh wow 2020-06-19 21:55:01 +02:00
Ghommie 162549a3c2 Fixing stuff. 2020-06-19 20:34:51 +02:00
kevinz000 1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
shellspeed1 b490f02c78 Ports IV bags from TG
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
2020-06-18 02:30:58 -07:00
Timothy Teakettle 2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
kevinz000 2e943e03a3 Merge pull request #12544 from SmArtKar/bee_shuttles
Shuttles from beestation
2020-06-17 08:35:34 -07:00
Trilbyspaceclone 8f35795971 Update autobotter_designs.dm (#12543) 2020-06-16 08:25:21 -07:00
SmArtKar 46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Timothy Teakettle 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
KathrinBailey 862ed61b86 [Ready] Improvised Weapons Update: Part 2 (#12386)
* Improvised Weapons Part 1: Shotgun & Rifle

Adds new sprites for ammo, the improvised rifle, the improvised shotgun. Adds a hand saw. Adds things to the crafting menu. Adds things to the autolathe menu.

* PR not yet ready - just cleaning issues.

Just trying to remark some of the issues resolved so I can see where I'm at a bit easier.

* Reverting changes to shotgun ammo names in the autolathe.

No point calling it 12G when there's no 20G anymore.

* Weapon weight + sprite improvements.

Makes sprites for gun parts bulkier with a low alpha pixel outline to make them easier to click on. They also look a bit closer to what their final product will be.

* oops forgot the "

* Revert "Merge branch 'master' into Improvised-Part-1"

This reverts commit 1e43d228d1bc35b0582244ed0bd91934573b3cdd, reversing
changes made to 207e9fccd4e8cffbe9ed26401a6f516fc44245dd.

* Revert "Revert "Merge branch 'master' into Improvised-Part-1""

This reverts commit 22d421d010c4a4c5c5e26f49fe6bffcf6198df42.

* My Github or environment isn't flipping out. no more.

Derp. Also projectile damage modifier fixed. I can actually compile without hundreds of errors.

* Made small weapon parts have w_class small.

I was testing it out and seeing the trigger assembly take so much space in my inventory seemed really odd.

* Duplicate definition refused.

Hurrdurr I suck.
Glad I gave this a quick look-voer.
Shotgun description edited to reflect the 0.8x damage modifier.

* Resolved tools.dmi merge conflict.

Just took the dmi from master and put the new sprites on at the end.

* DNM - Trying to see why usptream tools.dmi with my stuff added on the end is conflicting.

* Please don't conflict

* All of the stuff.

Fixes missing saw icons.
Improvised pistol, laser.
New weapon parts.
Part loot tables.
Ammo loot tables.
32acp ammo type + box.
Crafting changes.

* Fixing Travis errors + Pistol requires 1 plastic sheet

* Conflcits step 1 DNM

Do not merge do not merge do not merge

* Merge conflicts part 2 give mergies 🔪

fixes merge conflicts.
I like to upload a no changes file first then put stuff back on because it helps me find out what's having a fit.

* Plastic cost upped to 15 from 1 on pistol. You also need 1 plasteel.

3 plasteel total needed

* Made shotgun 2h because it's the only way to fix the issues this thing has.

Also the damage has been increased from 0.8* to 0.9* raising slugs from three shots to softcrit to two since it's now two-handed.

* mistake fixed

* Sprite updates!

New sprites for the old guns! <3

* Cleaned up guncrafting.dm

Made the descriptions more generic in case people add new weapons using these parts.

* Made more appropriate weight classes.

A lens shouldn't be weight class medium nor should the pistol grip.
Lens made tiny, grip made small.

* Adds rifle sling and updates backpack slot slung gun sprites.

Also fixes the description to say that you can't fire the 12G shotgun with one hand because ow owiee my wrists.
2020-06-12 13:38:27 -07:00