Commit Graph
22639 Commits
Author SHA1 Message Date
kevinz000 09770891a0 fix 2020-05-29 17:53:29 -07:00
kevinz000 14706a98f4 fixes 2020-05-29 17:48:58 -07:00
GhomandGitHub 668205c149 Unstucks robot mobs from permanent sprint mode. (#12389) 2020-05-29 14:56:19 -07:00
kevinz000 18bef15afc captain rapier 2020-05-29 02:36:13 -07:00
KathrinBaileyandGitHub ab86d669a7 Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical (#12383)
* yeah don't worry trilby I have the 'sprites'

* conflict
2020-05-28 23:30:34 -07:00
KathrinBaileyandGitHub 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
ddca75997b Skewers no longer cause deadchat spam (#12376)
* removes deadchat spam

Yikes

* Ghom's requested change

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-28 15:48:01 +02:00
9d169fc43e Adds unum (#12369)
* unoo

* bracket

* COMMA

* Update toys.dm

* fixes icons

* Update code/game/objects/items/toys.dm

Thanks ghommie

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* pool noodle and viro

* removes dupes

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-28 15:47:44 +02:00
Ghommie d4083aef33 casing. 2020-05-28 14:44:29 +02:00
Ghommie 295b366da4 Slight boss simple mob improvements. 2020-05-28 14:42:34 +02:00
RohesieandGitHub 2857a13933 nested (#12381) 2020-05-28 14:12:58 +02:00
Putnam3145andGitHub 811b801569 fixes ghost role eligibility delay (#12379) 2020-05-28 14:11:42 +02:00
kevinz000 03ee37bb06 let's finish parrying 2020-05-28 04:55:43 -07:00
GhomandGitHub ae62566dce Fixing some issues with the now unneeded hack for looms. (#12350) 2020-05-28 00:37:22 -07:00
LinandGitHub 8be491f32f change layer (#12377) 2020-05-28 00:37:09 -07:00
GhomandGitHub cea958f822 Fixing various issues. (#12368)
* Fixing various issues.

* Lights.
2020-05-28 00:36:57 -07:00
Putnam3145andGitHub 8e945bca4d Made restoring roundstart air restore the archive too (#12367) 2020-05-28 00:36:51 -07:00
GhomandGitHub bc4e4ca9f3 Fixing an issue with wooden barricades / wood sheets interaction (#12360) 2020-05-28 00:35:40 -07:00
kevinz000 6cf59ad115 woops 2020-05-27 23:24:50 -07:00
kevinz000 c19e00f6c3 fixes 2020-05-27 21:15:29 -07:00
kevinz000 f326c06324 fixEs 2020-05-27 21:07:07 -07:00
kevinz000 162e79df23 fixes dreamchecker errors 2020-05-27 18:17:00 -07:00
kevinz000 433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
GhomandGitHub 16dea7ceed Revamped the paper wizard robes. (#12348)
* Better paper wizard robes.

* return value.

* ooo

* Aaa

* aaaa
2020-05-27 18:01:22 -07:00
GhomandGitHub 968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
deathride58andGitHub 93a168d8a8 updates dmapi from dmapi 5.1.0 to dmapi 5.2.1 (based off tgstation/tgstation#51100 ) (#12364) 2020-05-27 17:58:43 -07:00
RohesieandGitHub d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
LinandGitHub 54bd506184 Merge pull request #12361 from Ghommie/Ghommie-cit794
Fixing some blindness stuff and visible messages.
2020-05-27 22:39:55 +00:00
LinandGitHub f7864a9245 Merge pull request #12366 from KathrinBailey/Soft-floors-for-soft-paws
Fix: Radiation Shutters
2020-05-27 22:39:09 +00:00
kevinz000andGitHub 9ca40290a3 Update _network_builder.dm (#12370) 2020-05-27 22:19:16 +02:00
kevinz000 52ea19da84 adjustment 2020-05-27 00:33:09 -07:00
kevinz000 1c064e9b5a appearance 2020-05-27 00:12:44 -07:00
kevinz000 dc3f02dbfb let's make it pretty 2020-05-27 00:08:00 -07:00
kevinz000 88476273fd almost ready 2020-05-26 23:46:15 -07:00
LinandGitHub 1b8e05875f Merge pull request #12357 from Citadel-Station-13/Ghommie-patch-1
quick tactical fix.
2020-05-26 17:13:32 +00:00
GhomandGitHub c877358340 Removes the immutable bit from the mining inquisitor/berserk hardsuits' slowdown. 2020-05-26 15:27:34 +02:00
kevinz000andGitHub 0bfe77e15a ok (#12365) 2020-05-26 15:24:23 +02:00
KathrinBailey 7b1e3204fb Fixes radiation shutters.
Changes rad_insulation from 0.2 to -0.5
This should make shutters actually work. It won't protect you from extreme radiation from things such as delaminating supermatters.
2020-05-26 11:32:23 +01:00
GhomandGitHub 85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
GhomandGitHub e11908a357 Oranges and Paperwork can be picked up again. (#12351) 2020-05-25 14:20:10 -07:00
Ghommie 900aae1c97 unrelated. 2020-05-25 16:28:45 +02:00
Ghommie 841bb86181 Fixing blindness stuff. 2020-05-25 16:10:25 +02:00
GhomandGitHub 8fd8b6a0bb Update tactical.dm 2020-05-25 11:16:51 +02:00
kevinz000 be02287dca category + compile 2020-05-24 15:21:52 -07:00
kevinz000 79f7ba9ac5 keybindings 2020-05-24 15:10:11 -07:00
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
kevinz000 95c6c7345c implementations 2020-05-24 14:56:01 -07:00
LinandGitHub ad57647e64 Merge pull request #12173 from kevinz000/projectiles_2
Refactors projectile speed to pixels per second
2020-05-24 21:21:41 +00:00
GhomandGitHub a41a06bc4b Fixing beam rifles lacking pin and pacifism checks. (#12349) 2020-05-24 13:29:45 -07:00
GhomandGitHub 07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00