Commit Graph

14810 Commits

Author SHA1 Message Date
kevinz000
b3afed69f4 huffles 2020-06-08 08:47:06 -07:00
kevinz000
92d1af5889 adjustments 2020-06-04 22:18:19 -07:00
kevinz000
a35fce64e2 fixes 2020-06-04 20:02:59 -07:00
kevinz000
bad809ffce fixes 2020-06-04 19:56:06 -07:00
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom
d53dca7322 Fixing just a couple issues. (#12417) 2020-06-02 15:30:22 -07:00
ynot01
ab3799ae7a Ports cornrows hairstyles from yogstation (#12423) 2020-06-02 15:29:07 -07:00
Ghom
d7954ca077 Yet another PR fixing some issues. (#12424) 2020-06-02 15:29:01 -07:00
TheObserver-sys
0d55a387d0 Powers Remembered: Chants (#12403)
* Initial Commit: Inath-Neq's Mantra

* A Volt of Inspiration

* Bug Squash I

* Bugsquashing II

* Bugsquashing III - Now with effects added!

* Bugsquashing IV: This probably won't work!

* It worked, how about that. Numbers Tweak.

* Better Number Tweaks

Co-authored-by: The0bserver <Gizmomaster777@gmail.com>
2020-06-02 15:27:13 -07:00
Ghom
07e42c079c Fixing cards states and user-less projectiles checking mean armor values. (#12400) 2020-06-02 15:24:13 -07:00
Ghom
ea763df326 Photosynthesis element. (#12394)
* Photosynthesis element.

* element yaketi sax.

* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
2020-06-02 23:48:50 +02:00
coldud13
17d4c99b25 alt click to remove containers from reagent grinder and biogenerator 2020-06-02 19:10:41 +10:00
kevinz000
effa47ec93 Update projectile.dm (#12380) 2020-06-01 21:46:02 +02:00
Lin
348885a58d Merge pull request #12382 from Ghommie/Ghommie-cit797
Slight simple mob boss improvements.
2020-05-31 15:22:23 +00: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
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
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