Commit Graph

14921 Commits

Author SHA1 Message Date
timothyteakettle
002fa1da1d how did i fuck that up 2020-06-16 00:34:28 +01:00
timothyteakettle
35aa1c4520 merge conflict fixes 2020-06-15 23:56:46 +01:00
timothyteakettle
61c338ca8c Merge branch 'embed-changes' of https://github.com/timothyteakettle/Citadel-Station-13 into embed-changes 2020-06-15 23:50:35 +01:00
timothyteakettle
e010212180 please work 2020-06-15 23:49:38 +01:00
Timothy Teakettle
eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Lin
898b0b6337 Merge pull request #12520 from Citadel-Station-13/kevinz000-patch-20
Lobotomy can no longer give magic resilience traumas
2020-06-15 14:06:32 -05:00
Lin
fd662047f3 Merge pull request #12518 from kevinz000/pp_fix
refactors projectile ricochet and fixes a runtime with projectile motion
2020-06-15 13:59:41 -05:00
Trilbyspaceclone
d7fd26c2a9 Moves decal painting from BEPIS into venders (#12393)
* Update bepis.dm

* Update assist.dm

* Update engivend.dm

* Update youtool.dm
2020-06-14 23:04:51 -07:00
Ghom
7513e032e3 petrification improvements (#12375)
* petrification improvements

* Standards.
2020-06-14 23:04:12 -07:00
Timothy Teakettle
6798699b18 slimes can change their body color using alter form (#12509)
* let slimes change their color!

* fix

* let them change hair colour

* Revert "let them change hair colour"

This reverts commit 561bc3d06733fcfee2bae5be819c5a3e57bfc89d.
2020-06-14 23:02:23 -07:00
Timothy Teakettle
5df4931266 fix food cart (#12523) 2020-06-14 22:50:16 -07:00
Lin
47adbd3e90 Merge pull request #12516 from kevinz000/vv_fix
Fixes VV not allowing proper access to datums in associative lists. Upgrades SDQL2 printout for the 3rd? 4th? 5th? time
2020-06-14 14:54:29 -05:00
Lin
894e6c7459 Merge pull request #12502 from kevinz000/shaps_is_once_again_based
Port - Lets you tape knives to cleanbots. You know, if you really want to. #47590/tgstation/Ryll-Ryll
2020-06-14 14:37:10 -05:00
Lin
923cb248d2 Merge pull request #12515 from kevinz000/roomba
Zoombas
2020-06-14 14:36:03 -05:00
kevinz000
fd076ec7bb Update cleanbot.dm 2020-06-13 16:19:32 -07:00
kevinz000
f2e905cb83 Update lobotomy.dm 2020-06-13 16:06:18 -07:00
kevinz000
9229c1dc0d Update lobotomy.dm 2020-06-13 13:12:54 -07:00
kevinz000
8162303bad Merge remote-tracking branch 'citadel/master' into pp_fix 2020-06-13 12:03:01 -07:00
kevinz000
3752aecfdb fix 2020-06-13 11:30:37 -07:00
kevinz000
180b7d31d9 sigh 2020-06-13 09:24:22 -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
kevinz000
3dbfc6ddf2 better support 2020-06-12 18:50:57 -07:00
kevinz000
e2aab5c1a5 css is really hard folks 2020-06-12 18:01:53 -07:00
kevinz000
e1a1dc61f6 this is ugly and i hate it 2020-06-12 17:50:23 -07:00
kevinz000
78e153cbe4 is this better 2020-06-12 17:32:17 -07:00
kevinz000
be6ea51f19 closing 2020-06-12 17:11:29 -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
kevinz000
c42894ddd9 css? 2020-06-12 17:07:10 -07:00
kevinz000
52ab6e557b fix 2020-06-12 17:00:01 -07:00
kevinz000
3cf14f4fad prettier 2020-06-12 16:48:22 -07:00
kevinz000
6cf18e1d49 why did i find replace 2020-06-12 16:38:28 -07:00
kevinz000
c7eead3f28 don't blind find/replace folks 2020-06-12 16:34:54 -07:00
kevinz000
146542b077 sdql2 2020-06-12 16:33:36 -07:00
kevinz000
00666422af fix 2020-06-12 15:47:46 -07:00
kevinz000
86a07fffc3 line fix 2020-06-12 15:34:40 -07:00
kevinz000
f9c624ef80 based vorestation 2020-06-12 15:32:32 -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
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
Timothy Teakettle
1e1463a9b1 attempted ricochet fix 2020-06-11 23:50:55 +01:00
Timothy Teakettle
a4c030d0bb attempted ricochet fix 2020-06-11 23:08:41 +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