Commit Graph

9242 Commits

Author SHA1 Message Date
kevinz000 65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -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
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
Ghommie e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02: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
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
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
Ghom bc4e4ca9f3 Fixing an issue with wooden barricades / wood sheets interaction (#12360) 2020-05-28 00:35:40 -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 968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
Rohesie d88c815845 vars (#12373) 2020-05-28 01:18:26 +02: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
Artur 3c973816d1 Ports https://github.com/tgstation/tgstation/pull/51125/ 2020-05-27 12:48:25 +03:00
kevinz000 52ea19da84 adjustment 2020-05-27 00:33:09 -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
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
Ghom 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
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
Lin ad57647e64 Merge pull request #12173 from kevinz000/projectiles_2
Refactors projectile speed to pixels per second
2020-05-24 21:21:41 +00:00
Ghom 0a6b755eff Apotechary chem dispenser nerf. (#12292)
* Apotechary chem dispenser nerf.

* Spelling and build_path.
2020-05-24 13:20:32 -07:00
Ghom 292f1afa3c Quick bandaid for table telescreens/buttons. (#12339) 2020-05-24 13:13:20 -07:00
Ghom ba3151bf1e Pills and pill bottles are now volumetric. (#12332) 2020-05-24 13:07:35 -07:00
Ghom ce1f1bdf5e Turning a few components into elements. (#12325)
* Turning a few components into elements.

* eh
2020-05-24 13:06:27 -07:00
Ghom ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07:00
Ghommie a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
kevinz000 e9068f05eb let's play the optimization game featuring lighting (#12310)
* debug proc

* kinda quirky

* let's play the lighting game

* let's play the macro game

* let's play the refactor game

* let's play the optimization game

* let's play the optimization game x2

* yeehaw

* e

* let's play the memory game

* fix

* lighting fix

* sanitization and checks

* mh

* hotkeys fix

* ok
2020-05-23 22:47:42 +02:00
Lin a6d7170d5b Merge pull request #12313 from kevinz000/click_logs
[s]click logging
2020-05-23 20:21:45 +00:00
Sonic121x 807a5c7d1e Fix stuff that no one care about (#12340)
* Update bags.dm

* Fix instant crush

* tweak frame delay

tweak the 3 variant of shutters frame delay to 0.38 per frame,make it took roughly 10 tick to close completely.
2020-05-23 14:48:39 +02:00
Detective Google d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
Artur 098b6642ae Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-22 16:19:17 +03:00
Artur 9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom 3430f0130d little canvas fix. (#12328) 2020-05-21 10:07:28 -07:00
Trilbyspaceclone b43a2861b6 Update watertank.dm (#12283) 2020-05-20 18:47:41 -07:00
Ghom 3ac61c0704 Porting tg painting code. (#12305)
* Porting tg painting code.

* yes.
2020-05-20 18:45:36 -07:00
Ghom 7f38e0714b Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302)
* Skill calculation fixes, tweaks, antag and brain damage modifiers.

* Experience through patience.

* Priority Fix etcetera.
2020-05-20 18:42:58 -07:00
kevinz000 b25a20e3f9 typo 2020-05-20 07:49:55 -07:00
kevinz000 89a14a82f0 ok 2020-05-20 07:46:58 -07:00
Ghom ed90c59d65 Removal of """silk""" (#12221)
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
2020-05-19 23:43:46 -07:00
Artur a16f2df71c Cleans up after oracleUI
Disablers paper for now until markdown paper is done
2020-05-19 20:34:45 +03:00
BlackMajor fc921289d6 Merge pull request #12149 from kevinz000/DMAPI5
Updates DMAPI to v5
2020-05-19 22:32:17 +12:00