Commit Graph

34444 Commits

Author SHA1 Message Date
Detective Google
6b6c5c6ecd don't go gently into the night, sweet prince. 2020-06-13 22:25:18 -05:00
Changelogs
065ca5d2fa Automatic changelog compile [ci skip] 2020-06-14 00:08:42 +00:00
CitadelStationBot
4a59066e43 Automatic changelog generation for PR #12505 [ci skip] 2020-06-12 21:28:35 -05:00
Lin
d73b2b8635 Merge pull request #12505 from deathride58/morelgbtholidays
Adds more LGBTQIA+ related holidays
2020-06-12 21:28:32 -05:00
CitadelStationBot
7a831f5512 Automatic changelog generation for PR #12510 [ci skip] 2020-06-12 21:27:07 -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
CitadelStationBot
a9b979ce90 Automatic changelog generation for PR #12514 [ci skip] 2020-06-12 21:25:53 -05: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
CitadelStationBot
f6ebb0b1c3 Automatic changelog generation for PR #12498 [ci skip] 2020-06-12 19:08:13 -05:00
Ghom
77c428479e changes the inefficient attack message string and threshold. (#12498) 2020-06-12 17:08:10 -07:00
CitadelStationBot
584a1428d5 Automatic changelog generation for PR #12503 [ci skip] 2020-06-12 19:08:03 -05:00
Ghom
37294fd4b7 Fixing wrong helmet type for old beserker hardsuit (#12503) 2020-06-12 17:07:59 -07:00
CitadelStationBot
c32b0387db Automatic changelog generation for PR #12506 [ci skip] 2020-06-12 19:07:51 -05: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
CitadelStationBot
a22cc190a0 Automatic changelog generation for PR #12513 [ci skip] 2020-06-12 17:17:35 -05: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
CitadelStationBot
41e46494cc Automatic changelog generation for PR #12489 [ci skip] 2020-06-12 16:41:25 -05: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
CitadelStationBot
60ff816f57 Automatic changelog generation for PR #11627 [ci skip] 2020-06-12 16:39:15 -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
CitadelStationBot
9215b484f4 Automatic changelog generation for PR #12507 [ci skip] 2020-06-12 16:29:44 -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
CitadelStationBot
a5de52136e Automatic changelog generation for PR #12386 [ci skip] 2020-06-12 15:38:30 -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
Changelogs
b3b67a6a4f Automatic changelog compile [ci skip] 2020-06-12 00:07:23 +00:00
The0bserver
3cb03387ed Sprites. 2020-06-11 15:23:26 -04: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
CitadelStationBot
e123e1f6a7 Automatic changelog generation for PR #12499 [ci skip] 2020-06-11 07:44:05 -05:00
EmeraldSundisk
6512866c06 Initial OmegaStation Security overhaul. (#12499)
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Add files via upload
2020-06-11 05:44:01 -07:00
CitadelStationBot
2cbc7d6149 Automatic changelog generation for PR #12494 [ci skip] 2020-06-11 07:43:43 -05: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
Changelogs
6c29415b6c Automatic changelog compile [ci skip] 2020-06-11 00:07:46 +00: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
CitadelStationBot
6ae46d6e44 Automatic changelog generation for PR #12495 [ci skip] 2020-06-10 00:22:57 -05: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
Changelogs
1e4904f76e Automatic changelog compile [ci skip] 2020-06-10 00:08:06 +00:00
CitadelStationBot
83a9a77426 Automatic changelog generation for PR #12471 [ci skip] 2020-06-09 10:02:37 -05:00
Ghom
6b4f7886e4 Merge pull request #12471 from Citadel-Station-13/poplock
poplocks hijack/glorious death
2020-06-09 17:02:32 +02:00
CitadelStationBot
64bc0e1917 Automatic changelog generation for PR #12363 [ci skip] 2020-06-09 07:34:26 -05:00
Trilbyspaceclone
f42994c79b Toxin tweaks! Just storage (#12363)
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
2020-06-09 05:34:22 -07:00
CitadelStationBot
2c2418c357 Automatic changelog generation for PR #12479 [ci skip] 2020-06-09 05:28:04 -05:00