afbbde610a
Merge pull request #12201 from Ghommie/Ghommie-cit740
...
Purging unused dogborg items.
2020-05-12 12:27:26 -07:00
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
1cf2311930
Merge pull request #12164 from Ghommie/Ghommie-cit733
...
Porting "Refactors language holder"
2020-05-10 14:16:42 -07:00
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
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
e0b91c53af
Purging unused dogborg items.
2020-05-10 22:17:05 +02:00
88d86e53d0
Porting some radial menu updates, and that one clown mask.
2020-05-09 00:45:48 +02:00
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02:00
ffd5dd9615
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
2020-05-08 19:01:28 +02:00
a412e840f7
'mob_run_block' and 'mob_check_block' macros
2020-05-08 18:52:32 +02:00
f770586407
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723
2020-05-05 05:09:29 +02:00
643ef48f0e
Macros, generic skill implementations.
2020-05-05 04:42:34 +02:00
8f29839dbf
Runechat Port ( #12065 )
...
* A
* A
* Ports Runechat
* compile fix
* fuck
* maybe?
* will this work?
* PLEASE
* fix
* fuck this
2020-05-03 03:53:19 +02:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
e54ba579d0
Update silicon_defense.dm
2020-04-25 20:52:27 -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
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02: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
c93f028a97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-21 01:53:41 +02:00
33039f9962
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization
2020-04-17 18:56:26 -07:00
87a6bd013c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-17 21:57:21 +02:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
7193efa613
Fixing some doggie issues.
2020-04-16 05:29:17 +02:00
1e8fffbf0b
Replaced all the extraneous flags with bitflags
2020-04-13 16:47:43 -07:00
d60932ca5d
Merge pull request #11697 from Ghommie/Ghommie-cit655
...
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02: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
8b2132317b
Ports a rewritten version of BAYSTRUMENTS ( #11680 )
...
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-07 15:21:50 +02:00
45d1917f0f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-02 16:07:13 +02:00
2bf6d888bd
Ports "Obliterates item_color: new washing machine functionality edition"
2020-03-30 18:31:26 +02:00
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
f419653c28
functionality
2020-03-28 23:50:06 -07:00
41e2c60d4a
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-27 22:52:43 +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
9d0dbb38f8
Update robot_modules.dm
2020-03-20 01:52:43 -04:00
c11275e4ba
Update robot.dm ( #11505 )
2020-03-18 03:15:12 +01:00
9bd275e430
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-16 13:47:53 -07:00
70880624e6
implement blocktypes
2020-03-16 13:20:58 -07:00
a77be038b8
refactoring this whole thing again
2020-03-16 04:56:32 -07:00
9ead492bb0
changes
2020-03-16 00:28:18 -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
2113b63428
o boy
2020-03-14 21:42:23 -07:00
0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
kevinz000