Commit Graph

2048 Commits

Author SHA1 Message Date
Putnam3145 ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
Ghommie 5307676317 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-29 06:55:35 +02:00
silicons 5c10370326 Merge pull request #12601 from Detective-Google/piggyback
piggyback carrying people is no longer comically slow
2020-06-27 14:54:44 -07:00
silicons 45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
Detective Google a4c243331c aeugh 2020-06-24 17:25:39 -05:00
Detective Google e061f7f7ea piggyback carrying people is no longer comically slow 2020-06-24 17:10:41 -05:00
Ghommie fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02: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 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
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
kevinz000 eb572c9d47 Merge pull request #12537 from timothyteakettle/ports-tipping-medibots
ports tipping medbots from tg
2020-06-17 08:35:50 -07:00
kevinz000 2e943e03a3 Merge pull request #12544 from SmArtKar/bee_shuttles
Shuttles from beestation
2020-06-17 08:35:34 -07:00
SmArtKar 46c3e9e54d Shuttles 2020-06-16 18:16:14 +03: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
Timothy Teakettle d7bce8aec0 ports some events 2020-06-15 20:22:40 +01: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
Ghom 7513e032e3 petrification improvements (#12375)
* petrification improvements

* Standards.
2020-06-14 23:04:12 -07:00
Ghommie 02a21081a6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-15 02:21:21 +02: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
Timothy Teakettle 1c2366cc3d update files to tgs 2020-06-14 18:16:01 +01:00
kevinz000 8162303bad Merge remote-tracking branch 'citadel/master' into pp_fix 2020-06-13 12:03:01 -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
kevinz000 9a08623308 sigh 2020-06-12 18:39:45 -07:00
kevinz000 8e6dee515a null isn't an object 2020-06-12 17:16:36 -07:00
Ghom 77c428479e changes the inefficient attack message string and threshold. (#12498) 2020-06-12 17:08:10 -07:00
kevinz000 146542b077 sdql2 2020-06-12 16:33:36 -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
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 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 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 95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Ghom 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
deathride58 d0ff964c28 Adds more LGBTQIA+-related holidays! 2020-06-09 20:19:52 -04: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
kevinz000 f1f655268d Update volumetrics.dm 2020-06-07 22:02:45 -07:00
Ghommie 495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
kevinz000 bad809ffce fixes 2020-06-04 19:56:06 -07:00
deathride58 3eb3934e26 Adds Pride Month as a holiday! (#12436)
* Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits

* yknow what, while i'm at it, let's compress it
2020-06-04 15:40:31 -07:00
kevinz000 1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Ghommie 2f3fd48b84 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-05-31 16:08:52 +02:00