Commit Graph

22453 Commits

Author SHA1 Message Date
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000
f63bc2e2d3 flags 2020-05-30 00:42:41 -07:00
kevinz000
ae9fc5789d adds more support to stuff 2020-05-30 00:35:17 -07:00
kevinz000
f8741b6a0b adjust 2020-05-29 19:50:11 -07:00
kevinz000
517cd26ed3 Delete living_combat.dm 2020-05-29 19:19:49 -07:00
kevinz000
65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07:00
kevinz000
92a537da63 Damage fix 2020-05-29 19:12:46 -07:00
kevinz000
a8c0681e99 parrying works 2020-05-29 18:58:02 -07:00
kevinz000
8630c1481a effect text 2020-05-29 18:57:03 -07:00
kevinz000
809de27ffe yanderedev 2020-05-29 18:47:58 -07:00
Rohesie
5ab8d41d9a horns (#12384) 2020-05-30 03:25:27 +02:00
Arturlang
d7dc6bb57c Makes bloodsuckers not get fat (#12391) 2020-05-30 03:24:46 +02:00
Chayse Ramsay
f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
2020-05-30 03:17:56 +02:00
kevinz000
1f337ac65e itnerrupt 2020-05-29 18:03:04 -07:00
kevinz000
c9f651b6bd fix 2020-05-29 18:00:35 -07:00
kevinz000
09770891a0 fix 2020-05-29 17:53:29 -07:00
kevinz000
14706a98f4 fixes 2020-05-29 17:48:58 -07:00
Ghom
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
KathrinBailey
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
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
DeltaFire15
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
TheFakeElon
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
Rohesie
2857a13933 nested (#12381) 2020-05-28 14:12:58 +02:00
Putnam3145
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
Ghom
ae62566dce Fixing some issues with the now unneeded hack for looms. (#12350) 2020-05-28 00:37:22 -07:00
Lin
8be491f32f change layer (#12377) 2020-05-28 00:37:09 -07:00
Ghom
cea958f822 Fixing various issues. (#12368)
* Fixing various issues.

* Lights.
2020-05-28 00:36:57 -07:00
Putnam3145
8e945bca4d Made restoring roundstart air restore the archive too (#12367) 2020-05-28 00:36:51 -07:00
Ghom
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
Ghom
16dea7ceed Revamped the paper wizard robes. (#12348)
* Better paper wizard robes.

* return value.

* ooo

* Aaa

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

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
deathride58
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
Rohesie
d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
Lin
54bd506184 Merge pull request #12361 from Ghommie/Ghommie-cit794
Fixing some blindness stuff and visible messages.
2020-05-27 22:39:55 +00:00
Lin
f7864a9245 Merge pull request #12366 from KathrinBailey/Soft-floors-for-soft-paws
Fix: Radiation Shutters
2020-05-27 22:39:09 +00:00
kevinz000
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
Lin
1b8e05875f Merge pull request #12357 from Citadel-Station-13/Ghommie-patch-1
quick tactical fix.
2020-05-26 17:13:32 +00:00
Ghom
c877358340 Removes the immutable bit from the mining inquisitor/berserk hardsuits' slowdown. 2020-05-26 15:27:34 +02:00
kevinz000
0bfe77e15a ok (#12365) 2020-05-26 15:24:23 +02:00