Commit Graph

2871 Commits

Author SHA1 Message Date
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
silicons
78df740d19 Update debuffs.dm 2020-06-22 13:24:36 -07:00
Lin
2cd18f3dba Merge pull request #12557 from silicons/life
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
2020-06-21 18:32:58 -05:00
Ghommie
48c13fcc10 Removing now unused old embed behavior 2020-06-20 00:15:52 +02:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
Ghom
e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
2020-06-19 23:09:09 +02:00
Lin
3cdc73ff35 Merge pull request #12487 from kevinz000/erp_2
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
2020-06-18 13:37:10 -05:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
Timothy Teakettle
2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/

* Recipes fix
2020-06-16 16:22:56 -07:00
Timothy Teakettle
2d1d2eeda6 final fixes 2020-06-16 23:47:22 +01:00
Timothy Teakettle
d10dfbec5e fix maps but it works 2020-06-16 16:23:53 +01:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
kevinz000
433b42957c Update severe.dm 2020-06-13 14:14:00 -07:00
kevinz000
6bfdb762d4 Update tackle.dm 2020-06-13 14:13:01 -07:00
kevinz000
db9a96a4ed webedit moment 2020-06-13 13:24:28 -07:00
kevinz000
2544f6c5a4 Update severe.dm 2020-06-13 13:17:16 -07:00
kevinz000
49feb22b4d Update tackle.dm 2020-06-13 13:15:53 -07:00
Ghom
7dc7961b70 Clearing gc issues for a couple objects. (#12508)
* Clearing gc issues for a couple objects.

* Linter check.
2020-06-12 17:07:36 -07:00
deathride58
513ed1ab47 Fixes a major HTML injection vulnerability with flavortext by making flavortext store itself as encoded html instead of decoded html (#12513) 2020-06-12 15:17:32 -07:00
Lin
bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05: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
Timothy Teakettle
28e9542813 fixes 2020-06-11 21:58:13 +01:00
Timothy Teakettle
fda0d4d23e part 5 2020-06-11 21:47:48 +01:00
Timothy Teakettle
34c9a2f821 part 4 2020-06-11 21:45:32 +01:00
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle
8ec5672b85 tonne of fixes 2020-06-10 21:14:08 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Ghom
907d909861 Merge pull request #12493 from DeltaFire15/eldritch-affairs-exploit-fix
[s] xenobio golems can no longer be used to exploit eldritch affairs mechanics
2020-06-09 02:22:04 +02:00
DeltaFire
e2466f1e22 tiny bit of better performance 2020-06-08 21:29:29 +02:00
DeltaFire
c29be22f9b no more gamer time 2020-06-08 19:06:41 +02:00
Lin
1e3fd46c2d Merge pull request #12472 from Citadel-Station-13/kevinz000-patch-9
makes default photosynthesis MUCH less punishing
2020-06-08 11:25:15 -05:00
Ghom
f3af445c94 Update material_container.dm (#12491) 2020-06-08 09:09:53 -07:00
Ghommie
9e19c0bb17 AAAAAA 2020-06-08 08:19:47 +02:00
Ghommie
ad6b835e8b Linter. 2020-06-08 08:12:29 +02:00
kevinz000
a4a0295312 ok 2020-06-07 21:27:36 -07:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
kevinz000
5b863e7e9b Update photosynthesis.dm 2020-06-07 03:43:41 -07:00
kevinz000
6f62cb8678 Update photosynthesis.dm 2020-06-07 03:40:34 -07:00
Lin
5e37d3ef3b Merge pull request #12430 from Ghommie/Ghommie-cit811
Fixing various icons problems with some clothings.
2020-06-03 20:23:16 +00:00
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom
d53dca7322 Fixing just a couple issues. (#12417) 2020-06-02 15:30:22 -07:00
Trilbyspaceclone
f926dd7f5e Update pockets.dm (#12421) 2020-06-02 15:29:51 -07:00
Ghom
ea763df326 Photosynthesis element. (#12394)
* Photosynthesis element.

* element yaketi sax.

* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
2020-06-02 23:48:50 +02:00
Ghommie
1a9484cf2e Fixing missing clothing icons etc. 2020-06-02 17:43:31 +02:00
Arturlang
597432424c Buffs lunging gloves a bit, so they arent a detriment to the user as much (#12336)
* Buffs leap all around

* Kev suggestions

* Im stoopid
2020-06-01 21:51:41 +02:00