2002a273de
Makes empty internal tanks printable
2020-06-04 16:04:16 -07:00
8c5005d572
Vrsleeper works, linkage for art and bepis
2020-06-01 19:15:19 +03:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
ff51c9d2db
Improvised Weapons Update: Part 1 ( #12226 )
...
* 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
2020-05-28 23:24:42 -07:00
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
2e1cc498a3
corrects WT-550 ammo to state 32 rather then 20 ( #12275 )
2020-05-17 01:05:24 +02:00
9d2399ce9f
Removing unused files and fixing some stuff. ( #12250 )
2020-05-15 07:15:15 -07:00
899c5a4575
Corrects evey storge with storage ( #12220 )
...
* Update medical.dm
* Update autobottler.dm
* Update autobotter_designs.dm
* Update medical_designs.dm
* Update hardsuit.dm
* Update code/modules/cargo/bounties/medical.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-13 21:21:11 +02:00
dabdf16eac
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
8458f97692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-05-12 13:34:31 -07:00
395d434e6e
Merge pull request #12200 from Ghommie/Ghommie-cit738
...
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
f4f80594bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-05-11 17:10:55 -07:00
e8d7da56f4
Ported C++mos from yogs (help me)
2020-05-11 15:44:26 -07:00
657a4831b4
Merge pull request #12182 from kappa-sama/patch-25
...
you can now mass produce electrochromatic kits
2020-05-11 04:18:48 -07:00
8cbe44f20c
Merge pull request #12192 from Ghommie/Ghommie-cit737
...
Reorganizing techweb nodes into a subfolder.
2020-05-11 04:07:16 -07:00
e8a0ea5acc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit731
2020-05-11 00:34:22 +02:00
1cf2311930
Merge pull request #12164 from Ghommie/Ghommie-cit733
...
Porting "Refactors language holder"
2020-05-10 14:16:42 -07:00
667c12d413
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00
2b429a93d2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit737
2020-05-10 06:30:41 +02:00
015660c806
Trilby's grammar is a F-
2020-05-10 06:21:29 +02:00
c4c4285b00
Reorganizing techweb nodes in a subfolder.
2020-05-10 06:20:04 +02:00
f7808e97ad
fix ( #12188 )
2020-05-10 02:58:58 +02:00
324d039f64
adds these
2020-05-09 18:00:23 -04:00
6067370a6f
shotgun shell clips ( #11955 )
...
* shell clips revised by based ghom
* lmao yeet better not forget that bit
* nitpicking but also merge 11976 first
* No freeloaders.
* Update weapon_designs.dm
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-09 02:49:25 +02:00
3531459d8b
Some trauma rebalancing ( #12144 )
...
* Some trauma rebalancing.
* Wow I didn't actually commit the 50% change
* when did i stop compiling before pushing
2020-05-09 01:42:39 +02:00
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02:00
90bf157f5e
Fixing some runtimes and issues.
2020-05-08 17:17:33 +02:00
43dc1319d9
Merge pull request #12097 from Ghommie/Ghommie-cit720
...
Implementing the NO_PUBLIC_LATHE build_type flag.
2020-05-07 21:04:57 -07:00
7c54da65a2
The great material rebalance ( #12123 )
...
* haha bet
* Update stock_parts.dm
* ok
2020-05-07 18:16:14 +02:00
2cbb659eb9
Implementing the NO_PUBLIC_LATHE build_type flag.
2020-05-03 06:15:40 +02:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
b68f1aaf72
Merge pull request #12084 from Ghommie/Ghommie-cit717
...
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
2020-05-02 15:55:19 -07:00
f659c036ef
Merge pull request #12036 from kevinz000/electrochromatic_windows
...
Electrochromatic (dim-on-demand) windows
2020-05-02 19:13:29 +00:00
21c9c98412
> & < agony ( #12082 )
...
hm yes today a check being the wrong way will break exo nanites.
2020-05-02 00:36:03 +02:00
b383066e57
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
2020-05-02 00:00:49 +02:00
54e76e8ffb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697
2020-05-01 21:49:52 +02:00
269db0c7d6
Identification components + chameleon clothing from uplink is now obfuscated ( #12045 )
...
* fine we'll use components
* syndie kits
* Whew
* examine
* flags
* whew
* compile
* fix
* fix
* ok
* ok
* ok
* done
2020-05-01 18:39:45 +02:00
af3651172c
wow lotsa effort huh
2020-04-26 03:29:31 -07:00
f6a5f92ff3
Merge pull request #11918 from Ghommie/Ghommie-cit689
...
nerf to biogenerator upgrades, removal of flour and glass bottles designs.
2020-04-25 16:59:38 -07:00
36512938a0
Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
...
Adds nanite replication protocols to our techweb
2020-04-25 16:54:32 -07:00
da61b04ed0
Merge pull request #11997 from Ghommie/Ghommie-cit705
...
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
0c1c879fb4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697
2020-04-25 02:49:59 +02:00
a62f3f0d92
Clarifies a comment.
2020-04-24 01:12:33 +02:00
shellspeed1