Commit Graph

5635 Commits

Author SHA1 Message Date
Ghommie
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghommie
324f75c4db Makes the thing actually work. 2020-03-05 21:41:41 +01:00
Ghommie
6de290758b Oh, yea. 2020-03-05 19:07:24 +01:00
Ghommie
2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
kevinz000
5bca5690c4 ok 2020-03-05 01:00:35 -07:00
kevinz000
e027d22fd8 eh ok 2020-03-05 00:53:18 -07:00
kevinz000
032b973d82 wow that's a lot of effort 2020-03-05 00:51:05 -07:00
kevinz000
76541ff57a getting worse 2020-03-05 00:16:22 -07:00
kevinz000
b718e0e0d6 fuck 2020-03-04 16:46:09 -07:00
kevinz000
8d1e36e076 k 2020-03-04 15:49:47 -07:00
kevinz000
d1f161fe0f changes 2020-03-04 15:42:01 -07:00
Ghom
c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
fix nose booping
2020-03-04 23:40:54 +01:00
Lin
1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2
Fixing mob holders inventory slot flags (ergo they are not glasses)
2020-03-04 13:29:13 -06:00
kevinz000
0d312b8dff only way 2020-03-04 08:02:28 -07:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
kevinz000
c28a78de3d ok 2020-03-04 06:41:53 -07:00
kevinz000
1ae4ef16bc sigh 2020-03-04 06:03:51 -07:00
kevinz000
6354b48659 fix 2020-03-03 20:58:06 -07:00
kevinz000
7291417244 fix 2020-03-03 20:57:03 -07:00
kevinz000
f8187d0fbf optimize move under living 2020-03-03 20:51:50 -07:00
kevinz000
334f1cc1cf linzolle 2020-03-03 20:48:39 -07:00
kevinz000
1d198aca88 CHECK_MOBILITY 2020-03-03 20:41:08 -07:00
deathride58
49ad376e5e Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this. 2020-03-03 17:44:10 -05:00
deathride58
560192c45a Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate 2020-03-03 15:49:25 -05:00
Lin
622a060857 use defines 2020-03-03 20:22:57 +00:00
Lin
6e4a22f4fe fix boop 2020-03-03 20:18:08 +00:00
deathride58
9efdad1d6b Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome. 2020-03-03 13:55:33 -05:00
Ghom
107a6434fd Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23
you can no longer stamcrit a goddamn xenomorph come on citadel why is this a thing
2020-03-03 13:36:52 +01:00
Ghom
81bb6978de Merge pull request #11250 from Seris02/risingbassnerf
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01:00
Ghom
6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1
fix flypeople nutrition
2020-03-03 13:24:32 +01:00
Seris02
8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000
c21bd60929 fix 2020-03-03 03:04:23 -07:00
kevinz000
c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
Lin
fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
Ghom
bee392257e Update monkey.dm 2020-03-02 23:02:16 +01:00
Ghom
99841c9447 Update pai_shell.dm 2020-03-02 23:00:41 +01:00
Ghom
aa1f9a3695 Update _drone.dm 2020-03-02 22:59:00 +01:00
Ghom
15fed0386c Update lizard.dm 2020-03-02 22:56:15 +01:00
Ghom
6f74d2a188 Update elite.dm 2020-03-02 22:34:29 +01:00
kevinz000
6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
Kraseo
50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 17:38:08 +01:00
Ghom
782f992c8c Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19
Pushing stuff now checks for Process_Spacemove on the automatic step
2020-03-02 16:34:18 +01:00
kevinz000
1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
Kraseo
e5e05d5d61 handles cases where stripping plasmamen would not give them what they need to not die 2020-03-02 11:47:44 +01:00
kevinz000
7ade79ce80 small fix 2020-03-02 03:05:51 -07:00
Lin
bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
Ghommie
c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00