Commit Graph

3476 Commits

Author SHA1 Message Date
kevinz000
18bef15afc captain rapier 2020-05-29 02:36:13 -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
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
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
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
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
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
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
ed90c59d65 Removal of """silk""" (#12221)
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
2020-05-19 23:43:46 -07:00
DeltaFire15
30f296b2c7 Clockies now can summon shields to bash nonbelievers into orbit. (#12252)
* Shield time

Adds a shield for clockies which empowers bashes via the damage it blocks. Might or might not compile yet. Icons going to be added in the next commit because I'd rather not have to revert all instead of just the icons if I do a fucky

* Icon time

Adds the icons for the clockie shield. Just the implementation + icons as of now, no way to get it. Might still not compile 😳

* Compilation issue resolution

Now it compiles. So it works. Maybe.

* Little change

Only harm-intent bashes amplify the bash / use energy.

* Fixes up shield.dms repeair proc and moves the brass shield repair there

Oh cool time to throw in a fix aswell, neat!

* Some tweaks

Buffs the shields armor and integrity since it was VERY easy to break with energy before, now its medium against those and very strong against ballistics. also a bit easier to accumulate charge because its ''only'' 50% block

* Some more stuff for the shield

Adds a spell to summon the shield (20dc time, 600kw cost, tier-two spell)
aswell as adding some ''fun'' for non-clockie users of the shield.

* typo man bad

* more spellchecking

* even more little tweaks

* clarification on a comment

* sound tweak

only plays a special sound if its an empowered bash

* final tweakies before PR

* Abuse safeguard

Yeeah might be best to not allow clockies to bash eachother for infinite charge.

* another typo fix

I really shouldn't have been coding stuff for this at 5 am...

* Safeguards for a VERY specific edge case

Would have caused some weird behavious for edge cases if not resetting the values, so I'm doing it to be sure.

* 5am code bad

same thing like the previous commit but not unreachable because of return statements.

* Applying requested changes / suggestions proposed by Ghommie

Early return statement done by the harmful / servant check, other returns / simillar done via . = ..()

* Formatting
2020-05-18 14:47:44 +02:00
Ghom
08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282)
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
2020-05-17 17:04:15 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280)
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
2020-05-17 16:35:17 -07:00
Ghom
7c7147cb3e Field of Vision component. (#12075)
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
Ghom
9d2399ce9f Removing unused files and fixing some stuff. (#12250) 2020-05-15 07:15:15 -07:00
kevinz000
10944d1b52 The bag of holding (and I guess backpack) balancing pass no one asked for (#11864)
* Ok

* whew

* ok

* fix

* ehh

* fix

* buff disks

* Update _compile_options.dm

* Update tgstation.dme
2020-05-15 03:44:56 +02:00
kevinz000
f44e9b662b Merge pull request #12238 from Ghommie/Ghommie-cit747
Some quick economy fixes and improvements.
2020-05-14 04:48:14 -07:00
Ghommie
62418ced9d floor 2020-05-13 03:50:27 +02:00
Ghommie
88e499a39a Some quick economy fixes and improvements. 2020-05-13 03:31:16 +02:00
kevinz000
5364666d0c Merge pull request #12212 from Trilbyspaceclone/patch-376
Buffs and corrects organ storage box
2020-05-12 12:34:45 -07:00
kevinz000
395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
kevinz000
afbbde610a Merge pull request #12201 from Ghommie/Ghommie-cit740
Purging unused dogborg items.
2020-05-12 12:27:26 -07: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
Trilbyspaceclone
db87da599c Update firstaid.dm 2020-05-11 08:41:03 -04:00
Trilbyspaceclone
3c87647fd2 Update firstaid.dm 2020-05-11 08:32:36 -04:00
kevinz000
1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733
Porting "Refactors language holder"
2020-05-10 14:16:42 -07:00
kevinz000
6b9fc7eccf Merge pull request #12169 from Ghommie/Ghommie-cit734
Porting some radial menu updates, and that one clown mask skin.
2020-05-10 14:14:19 -07:00
Ghommie
5ed6a18ef7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit740 2020-05-10 22:36:04 +02:00
Ghommie
e0b91c53af Purging unused dogborg items. 2020-05-10 22:17:05 +02:00
Ghommie
667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Lin
dd7db603d2 Merge pull request #12159 from Ghommie/Ghommie-cit732
'mob_run_block' and 'mob_check_block' macros
2020-05-10 18:25:16 +00:00
Kraseo
fd09bcf698 Fixes stacking multiple bear traps in one tile (#12168)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* no more deathstacks i guess

* that'll do piggy

* or not

* h elp

* ok this should do it for real this time

Co-authored-by: Changelogs <action@github.com>
2020-05-09 14:25:31 +02:00
kevinz000
407b1c7447 Merge remote-tracking branch 'citadel/master' into projectiles_2 2020-05-08 23:32:01 -07:00
kevinz000
5a716bfcfd Merge pull request #12143 from Ghommie/Ghommie-cit729
Demodularizing a few sprite assets.
2020-05-08 23:29:34 -07:00
kevinz000
6d6239a8b4 kay 2020-05-08 22:59:51 -07:00
Ghommie
364ca3fdf2 There is more! 2020-05-09 01:14:29 +02:00
Ghommie
88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Lin
ab8342d453 Merge pull request #12141 from Trilbyspaceclone/patch-367
Corrects medical packet crafting
2020-05-08 21:27:43 +00:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00