35 Commits

Author SHA1 Message Date
BlueWildrose 54089a159c SpookyStation fixes and edits (#16019)
* spooky 2023

* Spooky colormates, better telecomms?

* yes

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* yes

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* minor pre-merge change

I don't feel like requesting changes for this small of a nitpick so I'll just do it myself & merge.

---------

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2023-11-13 10:02:31 +01:00
Lin efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
keronshb b2a890269a Fixes destroy 2021-10-28 15:44:08 -04:00
keronshb 29a39ed9ea Indestructable change 2021-10-28 15:30:00 -04:00
keronshb 468b4a11ff More buffs 2021-10-28 11:26:18 -04:00
keronshb 1b38913867 Some linter fixes 2021-10-16 15:28:41 -04:00
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
The0bserver ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
Fermi ab27d5dd30 few new barth items and span fixes 2020-10-05 23:42:00 +01:00
Fermi bf5f755440 Oops missed something 2020-10-05 23:29:37 +01:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07: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
KathrinBailey ff51c9d2db Improvised Weapons Update: Part 1 (#12226)
* 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
2020-05-28 23:24:42 -07:00
Ghommie a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Fermi be470c2d18 Oranges are high 2019-10-29 08:07:11 +00:00
Fermi 5356afa9e6 Barthhhh 2019-10-29 06:14:31 +00:00
Thalpy 39f7116353 Oops 2019-10-29 03:22:21 +00:00
Thalpy 0fabd72087 Barth you fusspot 2019-10-27 22:40:45 +00:00
Thalpy c30f550274 Well here it is 2019-10-27 22:29:35 +00:00
Thalpy a76ff4efe6 Alright 2019-10-27 19:24:23 +00:00
Thalpy 739de1b378 Fixes 2019-10-27 19:07:06 +00:00
Thalpy e7c5e74d3a Hopefully no break 2019-10-13 23:41:06 +01:00
Thalpy 356a1279f1 Adds vars for the ball. 2019-10-13 20:06:40 +01:00
Fermi ecfc988911 Okay! 2019-10-12 09:15:32 +01:00
Fermi 8e71a20528 Oops 2019-10-11 18:16:25 +01:00
Fermi ae46b2932e Bath is ready to go. 2019-10-11 18:15:46 +01:00
Fermi 3ae8581d96 HOPE 2019-10-11 14:34:40 +01:00
Fermi 8f9622cbe2 Well lets try it 2019-10-09 18:01:09 +01:00
Fermi 8a7f27803c Maybe 2019-10-09 16:40:01 +01:00
Fermi 3eea5310c9 Ugh 2019-10-09 16:32:55 +01:00
Fermi b023671db4 Damnit Jaqc 2019-10-09 16:22:09 +01:00
Fermi 146e0aae29 Crashes make me sad 2019-10-09 15:03:04 +01:00
Fermi b34f648e60 Adds landmarks. 2019-10-09 13:57:19 +01:00
Fermi b19c078447 Restructuring. 2019-10-09 12:09:41 +01:00