Commit Graph

22647 Commits

Author SHA1 Message Date
kevinz000
6230e11f16 Update plushes.dm 2020-06-13 13:19:32 -07:00
kevinz000
278dfab74a Update plushes.dm 2020-06-13 13:10:14 -07:00
kevinz000
6f1dd34c91 Update plushes.dm 2020-06-13 11:57:11 -07:00
Lin
d73b2b8635 Merge pull request #12505 from deathride58/morelgbtholidays
Adds more LGBTQIA+ related holidays
2020-06-12 21:28:32 -05:00
Ghom
834432d59f Merge pull request #12510 from TheObserver-sys/Finally!AUseForPeas!
Finally, A use for peas!
2020-06-13 04:27:04 +02:00
Ghom
67c9ff4026 Merge pull request #12514 from Citadel-Station-13/kevinz000-patch-18-1
the abstract idea of shadows can no longer be radioactive
2020-06-13 04:25:50 +02:00
Ghom
77c428479e changes the inefficient attack message string and threshold. (#12498) 2020-06-12 17:08:10 -07:00
Ghom
37294fd4b7 Fixing wrong helmet type for old beserker hardsuit (#12503) 2020-06-12 17:07:59 -07:00
YakumoChen
2473308b4d Adds polychrome uniforms to loadout / kinkmate (#12506)
* adds revealing poly outfits to kinkmate

* Using unused poly uniforms

* adds polychrome to kinkmate
2020-06-12 17:07:48 -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
kevinz000
9c53ba5d68 Update emissive_blocker.dm 2020-06-12 15:13:34 -07:00
Lin
f39f933363 Merge pull request #12489 from Citadel-Station-13/kevinz000-patch-16-1
Disks are now smaller
2020-06-12 16:41:22 -05: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
Lin
ff216c9c94 Merge pull request #12507 from Citadel-Station-13/removesilicons
Clicking on atmospherics objects as a ghost will allow you to scan their air much like with an analyzer.
2020-06-12 16:29:40 -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
deathride58
245bf750c7 fixes a pair of dos vectors. this is apparently a day -1 patch! (#12511) 2020-06-12 11:54:18 -07:00
The0bserver
08be1292cd It's Mad Funny when everything breaks!
And even funnier still when you have to start all over again!
2020-06-11 15:02:17 -04:00
Timothy Teakettle
a8de357342 more simplemobs including slimes fit in pet carriers (#12494)
* make slimes small

* cockroaches/crabs/sloths
2020-06-11 05:43:40 -07:00
kevinz000
120826e1fc Update tanks.dm 2020-06-10 14:47:58 -07:00
kevinz000
5990239cfa Update portable_atmospherics.dm 2020-06-10 14:46:16 -07:00
kevinz000
70d1574c26 Update pipes.dm 2020-06-10 14:45:19 -07:00
kevinz000
41d186186b Update components_base.dm 2020-06-10 14:43:54 -07:00
kevinz000
0e58938253 Update scanners.dm 2020-06-10 14:42:27 -07:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
deathride58
d4621bb704 corrects the date for lesbian visibility! 2020-06-09 20:55:22 -04:00
deathride58
d0ff964c28 Adds more LGBTQIA+-related holidays! 2020-06-09 20:19:52 -04:00
Ghom
6b4f7886e4 Merge pull request #12471 from Citadel-Station-13/poplock
poplocks hijack/glorious death
2020-06-09 17:02:32 +02:00
Timothy Teakettle
14c9ab2ff1 ports tgs regal rats (#12479)
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
2020-06-09 03:28:00 -07:00
Ghom
77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -07:00
Trilbyspaceclone
81070b8ada New fermi chem Zeolites! (#12428)
* Zeolites!

* No loner hs debug numbers...
2020-06-09 03:25:40 -07:00
b1tt3r1n0
764ba26ace Pouches (#12432)
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
2020-06-09 03:22:39 -07:00
Timothy Teakettle
3692323615 plushmium: the fermichem that creates sentient plushies (#12450)
* create plushie mob and chem

* better plush

* sentience

* fixes

* more fixes

* spelling error

* okay this works better

* more work on sentiency

* fixes

* further fixes

* revert plush storage changes, add splash effect

* fix icons

* undo a change that i guess isnt needed

* remove spaces

* plushies are now space immune

* make warning text more clear

* dont give them more health than bears?

* give them 0/1 stamina damage

* bugfix

* squeak when attacked

* small refactor
2020-06-09 03:21:18 -07:00
kevinz000
139720e2ce Update code/modules/antagonists/traitor/classes/martyr.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-08 21:16:32 -07:00
kevinz000
3960050c71 Update code/modules/antagonists/traitor/classes/hijack.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-08 21:16:26 -07:00
Ghom
798de9baf1 Porting "Speeds up /datum/light_source/proc/update_corners() by 16% or so" (#12496) 2020-06-08 21:15:26 -07: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
bacd5b8478 oops 2020-06-08 19:10:39 +02:00
DeltaFire
c29be22f9b no more gamer time 2020-06-08 19:06:41 +02:00
Lin
52d6069e40 Merge pull request #12446 from kevinz000/hotkey_fixes
Adds modifier-independent hotkey bindings
2020-06-08 11:28:49 -05: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
NopemanMcHalt
e5bc651140 Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447)
* Station has a crew loose

Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform

* hotfix for digi ops
2020-06-08 09:14:19 -07:00
DeltaFire15
efddaa8cad removes early return (#12483)
This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it.
2020-06-08 09:10:06 -07:00
Ghom
f3af445c94 Update material_container.dm (#12491) 2020-06-08 09:09:53 -07:00
kevinz000
b3afed69f4 huffles 2020-06-08 08:47:06 -07:00
Ghom
881dfe81c5 Merge pull request #12187 from Trilbyspaceclone/patch-373
Nerfs cargo gas selling - MK different pr then the one that addresses this
2020-06-08 08:21:07 +02:00
Trilbyspaceclone
6cf4985360 Update large_objects.dm 2020-06-08 01:09:27 -04:00
Trilbyspaceclone
abaf633ab9 Update large_objects.dm 2020-06-08 01:09:06 -04:00
kevinz000
f1f655268d Update volumetrics.dm 2020-06-07 22:02:45 -07:00