36512938a0
Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
...
Adds nanite replication protocols to our techweb
2020-04-25 16:54:32 -07:00
da61b04ed0
Merge pull request #11997 from Ghommie/Ghommie-cit705
...
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
a62f3f0d92
Clarifies a comment.
2020-04-24 01:12:33 +02:00
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
1a6f5eb131
If it compiles it works
...
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
c8b3032087
Merge branch 'master' into cube-world
2020-04-23 02:04:56 -04:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
63870cc9d1
Movespeed modifiers refactor port.
2020-04-22 22:01:39 +02:00
5a6a205b9d
Merge pull request #11868 from Arturlang/tackling_and_lunge
...
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
62418d3fb8
Merge pull request #11909 from Putnam3145/owai-broom-mop
...
Adds more service stuff to lathes.
2020-04-20 11:43:30 -07:00
25b1b889dc
amazing truely amazing
2020-04-19 19:09:20 -04:00
14a5985891
Adds more service stuff to lathes.
2020-04-17 23:00:05 -07:00
7756a80beb
Merge branch 'master' into shields!
2020-04-17 19:32:39 -04:00
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
8fed6552cd
last fixes
2020-04-14 22:44:47 -04:00
4419dc13f5
changes and additons
2020-04-14 22:17:53 -04:00
5833ed8029
Merge branch 'master' into tools_andstuff
2020-04-14 10:10:32 -04:00
a96f6238df
Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
...
[Ready]Better crate options
2020-04-12 05:48:20 +02:00
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
f1deea99f7
adds back in the containment bag
2020-04-08 05:38:36 -04:00
8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
1f51e73dd6
more rng
2020-04-07 08:43:18 -04:00
09a5e234d3
Merge pull request #11716 from kiwedespars/lightpink-nerf
...
stabilized lightpink nerf - stabilized purple buff
2020-04-04 07:22:47 -07:00
9b6cd54abf
there's an extra space and it bugged me im sorry
2020-04-02 00:35:38 -07:00
eeccea989c
purple nerf - light pink gets epi back
2020-04-02 00:34:44 -07:00
d9e8db8a6c
Update _status_effects.dm
2020-04-01 23:31:51 -07:00
736760ac06
Minesweeper oopsies etcetera.
2020-04-01 04:39:36 +02:00
bf0970d8c3
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-23 15:34:04 -07:00
a6ca854e5c
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-22 15:07:41 -07:00
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
368d47aa69
Adds ghost role eligibility to various ghost roles. ( #11549 )
...
* Added ghost role eligibility to CTF, possession, random animal
* Also added possessed blade to it.
* Also removed some extraneous dead/observer things.
* ahaha whoops
2020-03-22 13:02:23 +01:00
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
0e3193e929
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important ( #11376 )
...
* combat refactoring
* i hate this
* mobility flags part 2 time xd
* whew
* stuff
* a
* ok
* changes
* Wew
* k
* add flags
* FUCKYOUVORE
* fixes
* typo
* no using this in hard stamcrit
* update icon
* woopsy
* . = ..()
* sigh
* Update living_combat.dm
* wew
* wups
* fix
* i hate you
* wrong button
* k
* ok
* bet
* k
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* early returns
* skreee
* agony
* k
* k
* k
* k
* wack
* compile
* wack
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-21 16:04:26 +01:00
6754b794b1
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-20 22:59:17 -07:00
8b0600a7fa
Merge pull request #11527 from Ghommie/Ghommie-cit628
...
More bug reports yee'd their last haw.
2020-03-19 18:56:32 -07:00
32975bf509
More bug reports yee'd their last haw.
2020-03-18 23:43:23 +01:00
9bd275e430
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-16 13:47:53 -07:00
3c97782a87
Merge pull request #11483 from Hatterhat/mining-borg-nerfs
...
mining borg nerfs - "they should be outclassed lategame"
2020-03-16 13:22:23 -07:00
7fdbcc55c6
s
2020-03-16 11:12:10 -07:00
8fdb1e5964
Merge pull request #11465 from Seris02/duffelbagholding
...
duffel bags of holding
2020-03-16 06:12:40 -07:00
1fe67d5ce9
a finger of the monkey's paw curls.
2020-03-16 01:35:47 -05:00
802d37a399
borgs should be outclassed lategame and not hunt
2020-03-15 15:55:31 -05:00
5a04b43db4
duffel baaaaaaaaaaags
2020-03-14 16:12:17 +08:00
aad3953355
Update all_nodes.dm
2020-03-12 20:52:07 -04:00
0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
b8642c5622
Merge pull request #11424 from necromanceranne/death_coma_stuff
...
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
2020-03-11 17:24:03 -07:00
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
c37d30a617
Some fixes requested by kev also ports a fix from tg
2020-03-11 15:43:47 +11:00
e210f7d535
Merge pull request #11391 from Ghommie/Ghommie-cit612
...
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
kevinz000