Commit Graph

16247 Commits

Author SHA1 Message Date
Letter N 151df41d1c asset cache + better minimaps 2020-05-31 16:15:09 +08:00
Ghom 48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392)
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
2020-05-31 00:54:28 -07:00
kevinz000 abc2b820a4 Update living_blocking_parrying.dm 2020-05-30 23:49:04 -07:00
kevinz000 faf65ae2b5 Merge branch 'combat_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into combat_rework 2020-05-30 23:46:34 -07:00
kevinz000 5b6e797c4f desword adjustments 2020-05-30 23:43:05 -07:00
kevinz000 250d078596 that was easy 2020-05-30 23:14:02 -07:00
kevinz000 34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000 d832cb6526 fix 2020-05-30 22:43:23 -07:00
kevinz000 2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000 1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000 c613726c2a render 2020-05-30 22:05:19 -07:00
kevinz000 e6020ca22c variable render 2020-05-30 21:02:13 -07:00
kevinz000 0723399ed4 render 2020-05-30 20:55:33 -07:00
kevinz000 d47841ee54 documentation 2020-05-30 20:38:07 -07:00
kevinz000 e5c32c1746 changes 2020-05-30 20:11:18 -07:00
kevinz000 502873cb7c Delete bindings_living.dm 2020-05-30 18:19:39 -07:00
kevinz000 4a971a223c Delete bindings_mob.dm 2020-05-30 18:19:04 -07:00
Letter N af1aa9758d matrix and orbit thing (#12399) 2020-05-31 02:20:20 +02:00
Ghommie 9a9e76664f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 22:47:13 +02:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
L 4b19e5863e cooldown 2020-05-30 06:16:34 -03:00
kevinz000 3251338d31 fix 2020-05-30 02:01:06 -07:00
kevinz000 519552cb78 more handling 2020-05-30 01:59:58 -07:00
kevinz000 1214c99a34 is this a good idea 2020-05-30 01:46:43 -07:00
kevinz000 b74d465b6c fix 2020-05-30 01:22:09 -07:00
kevinz000 6b0b20b171 infinite loop protection 2020-05-30 01:00:41 -07:00
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
Putnam3145 266707b119 Readded feeding to simplemobs (#12378) 2020-05-29 20:01:51 -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
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02: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
Ghommie a7934f3f88 event. 2020-05-29 18:58:34 +02:00
Ghommie e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Artur a6d7a33669 Exploit fixes for pappah 2020-05-29 18:23:33 +03:00
kevinz000 18bef15afc captain rapier 2020-05-29 02:36:13 -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