Commit Graph

202 Commits

Author SHA1 Message Date
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
kevinz000
b57e1c1e93 Rebindable Hotkeys (#12138)
* demodularize interface

* keybindings

* binds

* prefs

* loose ends

* globals

* changes

* s

* datum ref lists

* ok

* fixes

* fixes

* fix

* ok

* sigh

* sigh

* indicators

* let's play the move code around game

* let's play the i didn't comma my lists game

* let's play the indent game

* let's play hte spelling bee

* let's fail the spelling bee

* LET'S PLAY THe HOW HARd  IS  IT TO SPELL A PROC GAME

* let's play the bugfix game

* bugfixes

* improvements

* Update bindings_client.dm

* pixel shift

* A

* wups
2020-05-20 23:40:20 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie
cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
kevinz000
2335fd3ca6 kay (#12060) 2020-05-01 17:57:53 +02:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie
58fc679cce WIP 2020-04-24 20:49:15 +02:00
Ghommie
01f444b761 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-21 20:45:58 +02:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie
3bef4b88ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 02:29:34 +02:00
kevinz000
ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 19:32:50 -07:00
Ghommie
523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
Ghommie
87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie
586966ea51 General refactor for some snowflake bodyparts procs and taurs. 2020-04-16 03:37:52 +02:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Trilbyspaceclone
5833ed8029 Merge branch 'master' into tools_andstuff 2020-04-14 10:10:32 -04:00
Ghommie
983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
TrilbySpaceClone
1f51e73dd6 more rng 2020-04-07 08:43:18 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
keronshb
7e1e905a95 Line ending changes, I hope
here goes nothing.
2020-03-08 20:36:05 -04:00
keronshb
0d3da4fcc0 maybe? last go? 2
Should be the final part I hope
2020-03-08 20:11:13 -04:00
keronshb
94958581b9 maybe? last go?
maybe? last go?
2020-03-08 20:10:34 -04:00
keronshb
d460f5359e Hopefully this will fix it?
Hopefully this will fix it?
2020-03-08 18:49:18 -04:00
keronshb
9b63c7aa11 Trying to see if this will fix the line end issue
Trying to see if this will fix the line end issue
2020-03-08 18:48:42 -04:00
keronshb
228012c718 Blob refactor (#43872)
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
Kraseo
e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
Ghommie
2b740f9bad [s] Fixing an issue with slot machines crashing the server. 2020-02-23 13:09:21 +01:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
d2398f4584 Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2
Porting agent card updates and registered name fix.
2020-02-15 11:45:39 -07:00
kevinz000
f36b89a6e3 Update misc.dm 2020-02-14 11:53:50 -07:00
kevinz000
efc94565b6 Update misc.dm 2020-02-14 00:40:50 -07:00
kevinz000
e9baf17233 Update misc.dm 2020-02-14 00:40:19 -07:00
Ghom
bcc7949034 Update names.dm 2020-02-13 18:02:42 +01:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
kevinz000
24cbe67f27 optimizations, unnecessary crap, undocumented ipc change 2020-01-24 21:18:19 -07:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie
80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Seris02
a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00
Ghom
e7cf680ca7 Merge pull request #10266 from shellspeed1/master
New insect marking customization option and three new wings.
2019-12-25 03:43:29 +01:00
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
r4d6
ac1719810f Adding a list for the stations rooms 2019-12-19 15:23:23 -05:00
Ghommie
8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
kevinz000
b5595114c1 Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
2019-12-05 21:40:09 -07:00
Putnam3145
44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00